[Dolibarr/dolibarr] d10be4: FIX #12409 FIX #12408

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d10be4f1699ba8f3aa8978ed5c53160e5aacd9da
      
https://github.com/Dolibarr/dolibarr/commit/d10be4f1699ba8f3aa8978ed5c53160e5aacd9da
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  FIX #12409 FIX #12408


  Commit: edc03a5aeb553c7d543799518d21cc19ac07b975
      
https://github.com/Dolibarr/dolibarr/commit/edc03a5aeb553c7d543799518d21cc19ac07b975
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-11-13 (Wed, 13 Nov 2019)

  Changed paths:
    M htdocs/core/lib/ticket.lib.php
    M htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
    M htdocs/societe/paymentmodes.php
    M htdocs/ticket/class/ticket.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e35e3c884029...edc03a5aeb55