[Dolibarr-git] [Dolibarr/dolibarr] 13001a: Fix #2909

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 13001a5e9cfe15b54a76dedc672d7ba0effd6515
      
https://github.com/Dolibarr/dolibarr/commit/13001a5e9cfe15b54a76dedc672d7ba0effd6515
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-06 (Sat, 06 Jun 2015)

  Changed paths:
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  Fix #2909


  Commit: 1df1a0cd2aad97e84427bc5777eb1ce6681985f3
      
https://github.com/Dolibarr/dolibarr/commit/1df1a0cd2aad97e84427bc5777eb1ce6681985f3
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-06-06 (Sat, 06 Jun 2015)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M dev/codesniffer/ruleset.xml
    M dev/skeletons/skeleton_class.class.php
    M htdocs/adherents/canvas/actions_adherentcard_common.class.php
    M htdocs/adherents/class/adherent_type.class.php
    M htdocs/admin/company.php
    M htdocs/api/class/api.class.php
    M htdocs/api/class/api_access.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/card.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/document.php
    M htdocs/comm/askpricesupplier/class/askpricesupplier.class.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/class/mailing.class.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/note.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/apercu.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/deplacement/class/deplacement.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/paiement/class/paiement.class.php
    M htdocs/compta/sociales/class/paymentsocialcontribution.class.php
    M htdocs/contact/canvas/actions_contactcard_common.class.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/document.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/commonobjectline.class.php
    M htdocs/core/class/commonorder.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formmail.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/donation.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/askpricesupplier/modules_askpricesupplier.php
    M htdocs/core/modules/commande/modules_commande.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/facture/modules_facture.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/mailings/fraise.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/project/task/modules_task.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/core/modules/supplier_order/modules_commandefournisseur.php
    M htdocs/core/triggers/dolibarrtriggers.class.php
    M htdocs/don/class/don.class.php
    M htdocs/don/class/paymentdonation.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/loan/class/paymentloan.class.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks/task.php
    M htdocs/public/api/index.php
    M htdocs/public/test/test_forms.php
    M htdocs/resource/class/resource.class.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/client.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    A htdocs/theme/common/logo_cerfa.png
    A htdocs/theme/eldy/img/info_black.png
    M htdocs/theme/eldy/style.css.php
    M htdocs/user/class/user.class.php
    M htdocs/user/class/usergroup.class.php
    A scripts/product/migrate_picture_path.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4bac36d8108f...1df1a0cd2aad