[Dolibarr-git] [Dolibarr/dolibarr] 6aa7e9: Fix: merge problem

[Regis Houssin]

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

  Changed paths:
    M htdocs/admin/fournisseur.php
  M htdocs/core/class/conf.class.php
  M htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
  M htdocs/core/modules/supplier_order/modules_commandefournisseur.php

  Log Message:
  -----------
  Fix: merge problem