[Dolibarr-git] [Dolibarr/dolibarr] 948e0b: Fix: When on delivery receipt, ref of shipment was...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 948e0bf75397b0d2e60e53a18d29d33ebfcc43f6
      
https://github.com/Dolibarr/dolibarr/commit/948e0bf75397b0d2e60e53a18d29d33ebfcc43f6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M htdocs/core/lib/sendings.lib.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fix: When on delivery receipt, ref of shipment was not visible. Also
some tabs were missing.
Fix: After deletion of delivery receipt, we must go back to shipment of
delivery receipt.


  Commit: c4291c228eeca147d2b96aeff3d0b87602d8d328
      
https://github.com/Dolibarr/dolibarr/commit/c4291c228eeca147d2b96aeff3d0b87602d8d328
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php
    M htdocs/fourn/facture/fiche.php

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


  Commit: 959b104b78674966984ac45f79cd08f54ff7906c
      
https://github.com/Dolibarr/dolibarr/commit/959b104b78674966984ac45f79cd08f54ff7906c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix: the pdf template name for typhon as not correctly set when enabling
module.


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5740c22a4141...959b104b7867