[Dolibarr-git] [Dolibarr/dolibarr] 072247: Fix: Use correct translation key

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 072247f1c8d8b7c075d4c53e668b7eea02a5712f
      
https://github.com/Dolibarr/dolibarr/commit/072247f1c8d8b7c075d4c53e668b7eea02a5712f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M htdocs/admin/confexped.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/mod_expedition_ribera.php
    M htdocs/expedition/contact.php
    M htdocs/expedition/fiche.php
    M htdocs/expedition/index.php
    M htdocs/expedition/note.php
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/sendings.lang
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fix: Use correct translation key


  Commit: 60fbde02ac9400b31e9ef780dd6a2b44eee174b6
      
https://github.com/Dolibarr/dolibarr/commit/60fbde02ac9400b31e9ef780dd6a2b44eee174b6
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formcompany.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c88072433cd9...60fbde02ac94