[Dolibarr-git] [Dolibarr/dolibarr] 568d5c: Fixed: Tracking number restored on PDF shipments

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
      
https://github.com/Dolibarr/dolibarr/commit/568d5cb5ba8f2eddc729a4b6d362f24fe6fcf1eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/en_US/stocks.lang

  Log Message:
  -----------
  Fixed: Tracking number restored on PDF shipments
Fixed: Translation

Conflicts:
        htdocs/langs/en_US/agenda.lang