[Dolibarr-git] [Dolibarr/dolibarr] ce3b8e: Fix: broken features with multicompany

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ce3b8e5cc8622b1b7a8573e75ca22a0096deef7d
      
https://github.com/Dolibarr/dolibarr/commit/ce3b8e5cc8622b1b7a8573e75ca22a0096deef7d
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Fix: broken features with multicompany


  Commit: 4f600b6465f0cb5e56612311c61730648e5864a1
      
https://github.com/Dolibarr/dolibarr/commit/4f600b6465f0cb5e56612311c61730648e5864a1
  Author: Regis Houssin <address@hidden>
  Date:   2013-04-25 (Thu, 25 Apr 2013)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: use $conf->entity if defined


Compare: 
https://github.com/Dolibarr/dolibarr/compare/edc84f4168f7...4f600b6465f0