[Dolibarr-git] [Dolibarr/dolibarr] 33355c: FIX When we make a direct assignement on a task to...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 33355c613a89d353a558ead78d944faa2290c65c
      
https://github.com/Dolibarr/dolibarr/commit/33355c613a89d353a558ead78d944faa2290c65c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php

  Log Message:
  -----------
  FIX When we make a direct assignement on a task to a user, we must check
he is also assigned to project (and if not assign it)


  Commit: 25924f31ad5283a3af9db5a68a488048384e361a
      
https://github.com/Dolibarr/dolibarr/commit/25924f31ad5283a3af9db5a68a488048384e361a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/langs/en_US/projects.lang
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Bad translation


  Commit: 5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
      
https://github.com/Dolibarr/dolibarr/commit/5fd6057c6cb4a145b4b43acb4f52ccf284d702ff
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/contrat/card.php
    M htdocs/contrat/class/contrat.class.php

  Log Message:
  -----------
  FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.


  Commit: e0683681ffa16ce8d0cf9c7b699c4babf342c329
      
https://github.com/Dolibarr/dolibarr/commit/e0683681ffa16ce8d0cf9c7b699c4babf342c329
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Log Message:
  -----------
  Merge


  Commit: fccecc902dd239360ccbdc049697a100399e6cf3
      
https://github.com/Dolibarr/dolibarr/commit/fccecc902dd239360ccbdc049697a100399e6cf3
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-26 (Tue, 26 Jan 2016)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b690a2a860b9...fccecc902dd2