[Dolibarr-git] [Dolibarr/dolibarr] 32e384: Fix: travis error

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 32e38456671156b6cb8aca48306888c4d51ae3ab
      
https://github.com/Dolibarr/dolibarr/commit/32e38456671156b6cb8aca48306888c4d51ae3ab
  Author: Regis Houssin <address@hidden>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M htdocs/holiday/define_holiday.php

  Log Message:
  -----------
  Fix: travis error


  Commit: 12ec00428f447effb4feac86eadbcb4fa3396440
      
https://github.com/Dolibarr/dolibarr/commit/12ec00428f447effb4feac86eadbcb4fa3396440
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M ChangeLog
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/document.php
    M htdocs/adherents/ldap.php
    M htdocs/adherents/note.php
    M htdocs/adherents/subscription.php
    M htdocs/adherents/type.php
    M htdocs/adherents/type_ldap.php
    M htdocs/commande/card.php
    M htdocs/compta/bank/annuel.php
    R htdocs/compta/bank/bankentries.php
    A htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/budget.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/class/account.class.php
    M htdocs/compta/bank/document.php
    M htdocs/compta/bank/graph.php
    R htdocs/compta/bank/index.php
    M htdocs/compta/bank/info.php
    M htdocs/compta/bank/ligne.php
    A htdocs/compta/bank/list.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/treso.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/info.php
    M htdocs/compta/facture/note.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/contact/agenda.php
    M htdocs/contact/card.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/document.php
    M htdocs/contact/info.php
    M htdocs/contact/ldap.php
    M htdocs/contact/note.php
    M htdocs/contact/perso.php
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/contact.php
    M htdocs/contrat/document.php
    M htdocs/contrat/info.php
    M htdocs/contrat/list.php
    M htdocs/contrat/note.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/lib/bank.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/auguria.lib.php
    M htdocs/core/menus/standard/auguria_menu.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/menus/standard/eldy_menu.php
    M htdocs/core/menus/standard/empty.php
    M htdocs/core/photos_resize.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/list.php
    M htdocs/expedition/note.php
    M htdocs/expedition/shipment.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/document.php
    M htdocs/expensereport/info.php
    M htdocs/expensereport/note.php
    M htdocs/fichinter/card.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/contact.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/info.php
    M htdocs/fichinter/note.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/fourn/facture/contact.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/info.php
    M htdocs/fourn/facture/note.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/holiday/card.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/document.php
    M htdocs/holiday/list.php
    M htdocs/install/mysql/tables/llx_holiday.sql
    M htdocs/livraison/card.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/product/card.php
    M htdocs/product/class/product.class.php
    M htdocs/product/composition/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/info.php
    M htdocs/product/note.php
    M htdocs/product/price.php
    M htdocs/product/stats/card.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stats/supplier_proposal.php
    M htdocs/product/stock/product.php
    M htdocs/product/traduction.php
    M htdocs/supplier_proposal/card.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/supplier_proposal/document.php
    M htdocs/supplier_proposal/info.php
    M htdocs/supplier_proposal/note.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge branch 'develop' into develop_bug


  Commit: 927445ac47bc03989ce230e925985b58b63d9374
      
https://github.com/Dolibarr/dolibarr/commit/927445ac47bc03989ce230e925985b58b63d9374
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-03 (Tue, 03 Oct 2017)

  Changed paths:
    M htdocs/holiday/define_holiday.php

  Log Message:
  -----------
  Merge pull request #7544 from hregis/develop_bug

Fix: travis error


Compare: 
https://github.com/Dolibarr/dolibarr/compare/adc77be6d455...927445ac47bc