[Dolibarr-git] [Dolibarr/dolibarr] 339118: Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PI...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 339118d6f499ad860aa34ccd9933ae2dc5f7eedc
      
https://github.com/Dolibarr/dolibarr/commit/339118d6f499ad860aa34ccd9933ae2dc5f7eedc
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.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:
  -----------
  Prepare for option MAIN_GENERATE_PROPOSALS_WITH_PICTURE

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

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