[Dolibarr-git] [Dolibarr/dolibarr] 4d4803: Fix

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4d48034ad1f779956340d49ef7c32a92f71b7471
      
https://github.com/Dolibarr/dolibarr/commit/4d48034ad1f779956340d49ef7c32a92f71b7471
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M htdocs/core/lib/project.lib.php

  Log Message:
  -----------
  Fix


  Commit: 0083e529c706509e964b0237cc7fd8613a2a0d4b
      
https://github.com/Dolibarr/dolibarr/commit/0083e529c706509e964b0237cc7fd8613a2a0d4b
  Author: Maxime Kohlhaas <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/projet/class/task.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Add task 1300 : Add thm field on user and time spent to be able to calculate 
employee cost


  Commit: 58add21719b2ab0a7fdb1c8681c3fe2518e15d6a
      
https://github.com/Dolibarr/dolibarr/commit/58add21719b2ab0a7fdb1c8681c3fe2518e15d6a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-03-16 (Sun, 16 Mar 2014)

  Changed paths:
    M htdocs/core/lib/project.lib.php
    M htdocs/install/mysql/migration/3.5.0-3.6.0.sql
    M htdocs/projet/class/task.class.php
    M htdocs/user/class/user.class.php

  Log Message:
  -----------
  Merge pull request #1488 from atm-maxime/mko1300

Add task 1300 : Add thm field on user and time spent to be able to calculate 
employee cost


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b530488da146...58add21719b2