[Dolibarr-git] [Dolibarr/dolibarr] 8afffc: FIX: #11335

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8afffc87627f1236d1355080c835a1dfc840dd76
      
https://github.com/Dolibarr/dolibarr/commit/8afffc87627f1236d1355080c835a1dfc840dd76
  Author: Juanjo Menent <address@hidden>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    M htdocs/fourn/facture/card.php

  Log Message:
  -----------
  FIX: #11335


  Commit: a73ae49c4d623b3e9aabb31230187c4b5d264b04
      
https://github.com/Dolibarr/dolibarr/commit/a73ae49c4d623b3e9aabb31230187c4b5d264b04
  Author: Juanjo Menent <address@hidden>
  Date:   2019-06-14 (Fri, 14 Jun 2019)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  FIX: #11296


  Commit: 5a4f2fa0b38a2ef0be160e05ed725422106cc1e1
      
https://github.com/Dolibarr/dolibarr/commit/5a4f2fa0b38a2ef0be160e05ed725422106cc1e1
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M htdocs/fourn/facture/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge pull request #11342 from simnandez/9.0

FIX: #11335


  Commit: c0a30d1ff5484471a9bb9aa8ab4f6c1dad0472c4
      
https://github.com/Dolibarr/dolibarr/commit/c0a30d1ff5484471a9bb9aa8ab4f6c1dad0472c4
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

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

  Log Message:
  -----------
  FIX #11325 FIX #5249

Conflicts:
        htdocs/projet/tasks/time.php


  Commit: 6966a854b01d71dd121e4a0f6733f1a04e218f79
      
https://github.com/Dolibarr/dolibarr/commit/6966a854b01d71dd121e4a0f6733f1a04e218f79
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M htdocs/fourn/facture/card.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks/time.php

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

Conflicts:
        htdocs/projet/tasks/time.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f833dc11768c...6966a854b01d