[Dolibarr-git] [Dolibarr/dolibarr] 3793ae: FIX : wrong personnal project time spent

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3793ae323a8bf3ad7521cd272db6f3e8ba2d3f23
      
https://github.com/Dolibarr/dolibarr/commit/3793ae323a8bf3ad7521cd272db6f3e8ba2d3f23
  Author: gauthier <address@hidden>
  Date:   2017-10-19 (Thu, 19 Oct 2017)

  Changed paths:
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  FIX : wrong personnal project time spent


  Commit: 8ac7dd8e9a6fc8fe109f619632ab49588a6edac1
      
https://github.com/Dolibarr/dolibarr/commit/8ac7dd8e9a6fc8fe109f619632ab49588a6edac1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/class/task.class.php

  Log Message:
  -----------
  Merge pull request #7660 from atm-gauthier/fix_project_time_spent

FIX : wrong personnal project time spent


  Commit: fed0f3d09e8c992e695b30b5f63b34fd52efa9f4
      
https://github.com/Dolibarr/dolibarr/commit/fed0f3d09e8c992e695b30b5f63b34fd52efa9f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/core/lib/project.lib.php
    M htdocs/projet/class/task.class.php

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

Conflicts:
        htdocs/core/lib/project.lib.php
        htdocs/projet/class/task.class.php


  Commit: 9bcf01bf3f3d08b86b391bc67ac2d66a1ded4248
      
https://github.com/Dolibarr/dolibarr/commit/9bcf01bf3f3d08b86b391bc67ac2d66a1ded4248
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c387436a680b...9bcf01bf3f3d