[Dolibarr-git] [Dolibarr/dolibarr] 08f8ac: More complete example

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 08f8acc867af5a02d79207c9ceeb5ac84a8a617f
      
https://github.com/Dolibarr/dolibarr/commit/08f8acc867af5a02d79207c9ceeb5ac84a8a617f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  More complete example


  Commit: 254f46752ed529bdf7d17fe360ee8c094ae6aa4e
      
https://github.com/Dolibarr/dolibarr/commit/254f46752ed529bdf7d17fe360ee8c094ae6aa4e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/admin/commande.php
    M htdocs/admin/expedition.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    R htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    R htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    A htdocs/core/modules/expedition/doc/pdf_merou.modules.php
    A htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/expedition/fiche.php
    A htdocs/install/doctemplates/shipment/template_shipment.odt

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/9c9b81c9815b...254f46752ed5