[Dolibarr-git] [Dolibarr/dolibarr] 210d84: FIX The part added with hidden option MAIN_DOC_USE...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 210d8435daaafa5678f1c2c83abc0345c867912a
      
https://github.com/Dolibarr/dolibarr/commit/210d8435daaafa5678f1c2c83abc0345c867912a
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-06 (Sun, 06 Mar 2016)

  Changed paths:
    M 
htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    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/core/modules/project/doc/doc_generic_project_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  FIX The part added with hidden option MAIN_DOC_USE_TIMING was included
with a . instead of -. This make os think it is part of extension
instead of file name.


  Commit: 886aa1f8b61ad47ab73f995360493e89404217cc
      
https://github.com/Dolibarr/dolibarr/commit/886aa1f8b61ad47ab73f995360493e89404217cc
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-06 (Sun, 06 Mar 2016)

  Changed paths:
    M htdocs/fichinter/card.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/societe/commerciaux.php
    M htdocs/societe/soc.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/a73b53ff9cf5...886aa1f8b61a