[Dolibarr-git] [Dolibarr/dolibarr] e94b20: Fix: SQL error

[Laurent Destailleur]

  Branch: refs/heads/3.2
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e94b20f684cc465cc166e03d4b2c6cc95f74353f
      
https://github.com/Dolibarr/dolibarr/commit/e94b20f684cc465cc166e03d4b2c6cc95f74353f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-12 (Sat, 12 May 2012)

  Changed paths:
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Fix: SQL error


  Commit: da0dc3472b6a73d9b4e744c7dc55f6d6aead6cde
      
https://github.com/Dolibarr/dolibarr/commit/da0dc3472b6a73d9b4e744c7dc55f6d6aead6cde
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-12 (Sat, 12 May 2012)

  Changed paths:
    M htdocs/comm/action/fiche.php

  Log Message:
  -----------
  Fix: Pb with backtopage

Conflicts:
        htdocs/adherents/fiche.php


  Commit: 4278a113a0963bf8f42a8affd32456ef6b3c8235
      
https://github.com/Dolibarr/dolibarr/commit/4278a113a0963bf8f42a8affd32456ef6b3c8235
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-05-12 (Sat, 12 May 2012)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  Fix: hour reported is not user hour. To fix this, we show both hour
"server and user" but only if it differs.

Conflicts:
        htdocs/core/lib/functions2.lib.php


Compare: https://github.com/Dolibarr/dolibarr/compare/be85c5c...4278a11