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

[Regis Houssin]

  Branch: refs/heads/3.3
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 2f72bbca5ab19a6e39700207f18f50a7b2efda60
      
https://github.com/Dolibarr/dolibarr/commit/2f72bbca5ab19a6e39700207f18f50a7b2efda60
  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: d162a61d41118af12f30df6d80402a52a3d1d65a
      
https://github.com/Dolibarr/dolibarr/commit/d162a61d41118af12f30df6d80402a52a3d1d65a
  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/521929b740c0...d162a61d4111