[Dolibarr-git] [Dolibarr/dolibarr] 337885: New: Can cancel holidays that were previously vali...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 3378855694840055eebe8dc7e615d16e1f34a225
      
https://github.com/Dolibarr/dolibarr/commit/3378855694840055eebe8dc7e615d16e1f34a225
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/exports/export.php
    M htdocs/holiday/class/holiday.class.php
    M htdocs/holiday/fiche.php
    M htdocs/langs/en_US/holiday.lang
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/theme/eldy/style.css.php

  Log Message:
  -----------
  New: Can cancel holidays that were previously validated


  Commit: 12b15d3ae0ced02759b185a8803265b0c0668343
      
https://github.com/Dolibarr/dolibarr/commit/12b15d3ae0ced02759b185a8803265b0c0668343
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/margin/lib/margins.lib.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
        ChangeLog


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a7758bab0fe3...12b15d3ae0ce