[Dolibarr-git] [Dolibarr/dolibarr] 8f73c7: Fix: Remove debug

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8f73c7a82a41d4ac8afa7a448336d7929833ec4b
      
https://github.com/Dolibarr/dolibarr/commit/8f73c7a82a41d4ac8afa7a448336d7929833ec4b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php

  Log Message:
  -----------
  Fix: Remove debug


  Commit: 85748711b55cb4e1ba1ad54a2382737bd80d2ffb
      
https://github.com/Dolibarr/dolibarr/commit/85748711b55cb4e1ba1ad54a2382737bd80d2ffb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/fiche.php

  Log Message:
  -----------
  Fix: Table holiday_user was not initialized anymore.

Conflicts:
        htdocs/holiday/class/holiday.class.php
        htdocs/holiday/fiche.php


  Commit: 2d524f2edc0f88c30354c54e5968bff6dbe80f5e
      
https://github.com/Dolibarr/dolibarr/commit/2d524f2edc0f88c30354c54e5968bff6dbe80f5e
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: Holiday module was broken. Initializaion of amount of holidays
failed.


  Commit: c781bb4d087ef7e14756d315062e88f93585ff55
      
https://github.com/Dolibarr/dolibarr/commit/c781bb4d087ef7e14756d315062e88f93585ff55
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M ChangeLog
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/define_holiday.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/holiday/fiche.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9b9e51d50fb7...c781bb4d087e