[Dolibarr-git] [Dolibarr/dolibarr] : Fix: uniform code

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9fe45c4f4ff8c41734c36bc92604bb71a1559c65
      
https://github.com/Dolibarr/dolibarr/commit/9fe45c4f4ff8c41734c36bc92604bb71a1559c65
  Author: Regis Houssin <address@hidden>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

  Changed paths:
    M htdocs/comm/propal.php
  M htdocs/commande/fiche.php
  M htdocs/compta/facture.php
  M htdocs/langs/en_US/admin.lang
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/product/admin/produit.php

  Log Message:
  -----------
  Fix: uniform code


  Commit: d5131b0e167bb2b94ff97e26fbe7c6078b49d25c
      
https://github.com/Dolibarr/dolibarr/commit/d5131b0e167bb2b94ff97e26fbe7c6078b49d25c
  Author: Regis Houssin <address@hidden>
  Date:   2012-01-13 (Fri, 13 Jan 2012)

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

Conflicts:
        htdocs/comm/propal.php


Compare: https://github.com/Dolibarr/dolibarr/compare/7363b39...d5131b0