[Dolibarr-git] [Dolibarr/dolibarr] 589511: fix #9999

[Laurent Destailleur]

  Branch: refs/heads/8.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 589511f38cad5838b5c471ebad79afcc9f9255e6
      
https://github.com/Dolibarr/dolibarr/commit/589511f38cad5838b5c471ebad79afcc9f9255e6
  Author: florian HENRY <address@hidden>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/install/doctemplates/shipment/template_shipment.odt

  Log Message:
  -----------
  fix #9999


  Commit: c320dcd161307e7f4c8934cb7fb22252b4ad6ea9
      
https://github.com/Dolibarr/dolibarr/commit/c320dcd161307e7f4c8934cb7fb22252b4ad6ea9
  Author: florian HENRY <address@hidden>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M htdocs/expensereport/card.php
    M htdocs/public/payment/newpayment.php
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 
8.0_fix9999


  Commit: 3d09b05338ebe0668916b5a09ea16ddbc70e94a0
      
https://github.com/Dolibarr/dolibarr/commit/3d09b05338ebe0668916b5a09ea16ddbc70e94a0
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-12-01 (Sat, 01 Dec 2018)

  Changed paths:
    M htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/install/doctemplates/shipment/template_shipment.odt

  Log Message:
  -----------
  Merge pull request #10135 from atm-florian/8.0_fix9999

fix #9999


Compare: 
https://github.com/Dolibarr/dolibarr/compare/508cb459eb59...3d09b05338eb
      **NOTE:** This service has been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.