[Dolibarr-git] [Dolibarr/dolibarr] 427d17: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE

[Laurent Destailleur]

  Branch: refs/heads/3.3_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 427d177c5bac8ed88a3d4933cd7340fab5ace47f
      
https://github.com/Dolibarr/dolibarr/commit/427d177c5bac8ed88a3d4933cd7340fab5ace47f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE

Conflicts:
        htdocs/core/modules/propale/doc/pdf_azur.modules.php


  Commit: 651bc379618eaf827d4662c19a4389d8c817a4a5
      
https://github.com/Dolibarr/dolibarr/commit/651bc379618eaf827d4662c19a4389d8c817a4a5
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php

  Log Message:
  -----------
  Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE

Conflicts:
        ChangeLog
        htdocs/core/lib/pdf.lib.php
        htdocs/core/modules/propale/doc/pdf_azur.modules.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c62223379579...651bc379618e