[Dolibarr-git] [Dolibarr/dolibarr] d0cc07: Module Expense Report: reactivate conflictwith mod...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d0cc072a5855c4058bb28b40c7389ae404ee1631
      
https://github.com/Dolibarr/dolibarr/commit/d0cc072a5855c4058bb28b40c7389ae404ee1631
  Author: aspangaro <address@hidden>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M htdocs/core/modules/modExpenseReport.class.php

  Log Message:
  -----------
  Module Expense Report: reactivate conflictwith modDeplacement


  Commit: fd9fc191fcfa49858adb1717ccb3a99389fc0235
      
https://github.com/Dolibarr/dolibarr/commit/fd9fc191fcfa49858adb1717ccb3a99389fc0235
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M htdocs/core/modules/modExpenseReport.class.php

  Log Message:
  -----------
  Merge pull request #2388 from aspangaro/develop-patch8

Module Expense Report: reactivate conflict with modDeplacement


Compare: 
https://github.com/Dolibarr/dolibarr/compare/f23234356ec8...fd9fc191fcfa