[Dolibarr-git] [Dolibarr/dolibarr] 1f98a2: Fix: compatibility with multicompany

[Regis Houssin]

  Branch: refs/heads/3.2.1
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1f98a23587953987f81aa47949fc3db40cce9a42
      
https://github.com/Dolibarr/dolibarr/commit/1f98a23587953987f81aa47949fc3db40cce9a42
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Fix: compatibility with multicompany

Conflicts:
        htdocs/product/class/product.class.php


  Commit: 067a9b0820e9bd74dc24d358d362855e19e42af1
      
https://github.com/Dolibarr/dolibarr/commit/067a9b0820e9bd74dc24d358d362855e19e42af1
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M htdocs/product/class/product.class.php
    M htdocs/product/stock/class/entrepot.class.php
    M htdocs/product/stock/product.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
        htdocs/product/class/product.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/cd3df1d6e1c3...067a9b0820e9