[Dolibarr-git] [Dolibarr/dolibarr] 574f84: Fix warning for approval delay.

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 574f84bb84755d522e40e604d0e97e8f31d8f71c
      
https://github.com/Dolibarr/dolibarr/commit/574f84bb84755d522e40e604d0e97e8f31d8f71c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/list.php

  Log Message:
  -----------
  Fix warning for approval delay.


  Commit: d66bc10d0569573b8519a26310ee356119beee46
      
https://github.com/Dolibarr/dolibarr/commit/d66bc10d0569573b8519a26310ee356119beee46
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/list.php

  Log Message:
  -----------
  Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop

Conflicts:
        htdocs/expensereport/list.php


  Commit: 4875509b5679bc5fc86d6ed13af884c1a0eae8b0
      
https://github.com/Dolibarr/dolibarr/commit/4875509b5679bc5fc86d6ed13af884c1a0eae8b0
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M htdocs/expensereport/list.php

  Log Message:
  -----------
  Fix sort criterias


  Commit: 1307b93d55051526f47473b1ef0651bc1765d23f
      
https://github.com/Dolibarr/dolibarr/commit/1307b93d55051526f47473b1ef0651bc1765d23f
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-22 (Thu, 22 Dec 2016)

  Changed paths:
    M htdocs/holiday/define_holiday.php
    M htdocs/holiday/view_log.php

  Log Message:
  -----------
  Normalize code


Compare: 
https://github.com/Dolibarr/dolibarr/compare/77c320a092c7...1307b93d5505