[Dolibarr-git] [Dolibarr/dolibarr] cad44e: FIX substitution in ODT of thirdparties documents

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cad44ee68afe1b2b24a1b3020cb0eb2ff475970e
      
https://github.com/Dolibarr/dolibarr/commit/cad44ee68afe1b2b24a1b3020cb0eb2ff475970e
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  FIX substitution in ODT of thirdparties documents


  Commit: da8fe063013989b63416c708f8d49c0690feda4f
      
https://github.com/Dolibarr/dolibarr/commit/da8fe063013989b63416c708f8d49c0690feda4f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-10-22 (Sun, 22 Oct 2017)

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/theme/eldy/img/statut9.png
    M htdocs/theme/eldy/img/statut9_40x40.png

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a1217d61b634...da8fe0630139