[Dolibarr-git] [Dolibarr/dolibarr] e5c0a9: Fix: for multi-company

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: e5c0a99584400209e7bec96167e141aee7b46dea
      
https://github.com/Dolibarr/dolibarr/commit/e5c0a99584400209e7bec96167e141aee7b46dea
  Author: Regis Houssin <address@hidden>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M htdocs/comm/propal.php
  M htdocs/core/class/commonobject.class.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/class/html.form.class.php
  M htdocs/fourn/class/fournisseur.product.class.php
  M htdocs/product/photos.php

  Log Message:
  -----------
  Fix: for multi-company

Conflicts:

        htdocs/comm/propal/class/propal.class.php
        htdocs/core/class/html.form.class.php