[Dolibarr-git] [Dolibarr/dolibarr] 2fea95: Merge remote-tracking branch 'Dolibarr/develop' in...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2fea95f813241a8076b949f034820c88a883c246
      
https://github.com/Dolibarr/dolibarr/commit/2fea95f813241a8076b949f034820c88a883c246
  Author: Nicolas ZABOURI <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M ChangeLog
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/bookkeeping/listbyaccount.php
    M htdocs/adherents/agenda.php
    M htdocs/adherents/card.php
    M htdocs/adherents/list.php
    M htdocs/adherents/subscription/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/emailcollector_list.php
    M htdocs/admin/menus/index.php
    A htdocs/bom/bom_agenda.php
    M htdocs/bookmarks/list.php
    M htdocs/categories/index.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/list.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries_list.php
    M htdocs/compta/bank/list.php
    M htdocs/compta/facture/class/api_invoices.class.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/localtax/list.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/tva/list.php
    M htdocs/contact/agenda.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/list.php
    M htdocs/contrat/list.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/html.formmargin.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/usergroups.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
    M htdocs/cron/list.php
    M htdocs/debugbar/class/DebugBar.php
    M htdocs/don/list.php
    M htdocs/emailcollector/class/emailcollector.class.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/list.php
    M htdocs/exports/index.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/facture/list.php
    M htdocs/holiday/list.php
    M htdocs/imports/index.php
    M htdocs/install/mysql/data/llx_c_type_contact.sql
    M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
    M htdocs/install/mysql/tables/llx_asset.sql
    M htdocs/install/mysql/tables/llx_bom_bom.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
    M htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
    M htdocs/install/mysql/tables/llx_pos_cash_fence.sql
    M htdocs/install/mysql/tables/llx_societe_account.sql
    M htdocs/install/pgsql/functions/functions.sql
    M htdocs/langs/en_US/members.lang
    M htdocs/loan/list.php
    M htdocs/main.inc.php
    M 
htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
    M htdocs/modulebuilder/template/myobject_card.php
    M htdocs/modulebuilder/template/sql/llx_mymodule_myobject.sql
    M htdocs/opensurvey/list.php
    M htdocs/product/agenda.php
    M htdocs/product/class/product.class.php
    M htdocs/product/list.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/index.php
    M htdocs/projet/info.php
    M htdocs/projet/list.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/payment/newpayment.php
    M htdocs/resource/class/dolresource.class.php
    M htdocs/resource/list.php
    M htdocs/societe/agenda.php
    M htdocs/societe/card.php
    M htdocs/societe/list.php
    M htdocs/societe/paymentmodes.php
    M htdocs/societe/website.php
    M htdocs/supplier_proposal/list.php
    M htdocs/takepos/pay.php
    M htdocs/takepos/takepos.php
    A htdocs/theme/eldy/btn.inc.php
    M htdocs/theme/eldy/global.inc.php
    M htdocs/theme/eldy/theme_vars.inc.php
    M htdocs/ticket/list.php
    M htdocs/user/group/list.php
    M htdocs/user/hierarchy.php
    M htdocs/user/list.php
    M htdocs/user/perms.php
    M htdocs/variants/list.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Dolibarr/develop' into develop


  Commit: 61c17f8d0fc32b0d12a020bedbe4cb49c60aaa78
      
https://github.com/Dolibarr/dolibarr/commit/61c17f8d0fc32b0d12a020bedbe4cb49c60aaa78
  Author: Nicolas ZABOURI <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/user/passwordforgotten.php

  Log Message:
  -----------
  FIX #11135


  Commit: 4b3d0ed50cf671835e0d0fafc9efa95f8feb9c3a
      
https://github.com/Dolibarr/dolibarr/commit/4b3d0ed50cf671835e0d0fafc9efa95f8feb9c3a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Update user.class.php


  Commit: 3109f8e07a228d353b0b36473ab2a621e052739e
      
https://github.com/Dolibarr/dolibarr/commit/3109f8e07a228d353b0b36473ab2a621e052739e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-05-19 (Sun, 19 May 2019)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/user/passwordforgotten.php

  Log Message:
  -----------
  Merge pull request #11217 from inoveaconseil/FIX11135

FIX #11135


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2bbb04085ea5...3109f8e07a22