[Dolibarr-git] [Dolibarr/dolibarr] ad0947: Fix: Better management of pdf generation when tcpd...

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: ad09470f48dbbf8374171c82847145e916c7c79e
      
https://github.com/Dolibarr/dolibarr/commit/ad09470f48dbbf8374171c82847145e916c7c79e
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Fix: Better management of pdf generation when tcpdf not available.


  Commit: c2ba7956ab780889bf104cccb2d9a47d05de174f
      
https://github.com/Dolibarr/dolibarr/commit/c2ba7956ab780889bf104cccb2d9a47d05de174f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-09-22 (Sun, 22 Sep 2013)

  Changed paths:
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/project/pdf/pdf_baleine.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/rapport/pdf_paiement.class.php
    M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
        htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
        htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/16396b985be4...c2ba7956ab78