[Dolibarr-git] [Dolibarr/dolibarr] 807cbe: Add option MAIN_GENERATE_DOCUMENT_WITH_PICTURE

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 807cbe416310ac8c43046c371f3fa3456a2b7d14
      
https://github.com/Dolibarr/dolibarr/commit/807cbe416310ac8c43046c371f3fa3456a2b7d14
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

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

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


  Commit: 7cff7d3250a9559a5935dbeb3ca1cd9ad1a4689a
      
https://github.com/Dolibarr/dolibarr/commit/7cff7d3250a9559a5935dbeb3ca1cd9ad1a4689a
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M ChangeLog
    M build/debian/control
    M htdocs/adherents/cotisations.php
    M htdocs/admin/geoipmaxmind.php
    M htdocs/admin/system/perf.php
    M htdocs/commande/class/commande.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/tpl/passwordforgotten.tpl.php
    M htdocs/fourn/commande/liste.php
    M htdocs/langs/ca_ES/compta.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/compta.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/paypal/admin/paypal.php
    M test/phpunit/ModulesTest.php

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


  Commit: 330d2173be0ba86d939e34d1b67f321b49d2dc99
      
https://github.com/Dolibarr/dolibarr/commit/330d2173be0ba86d939e34d1b67f321b49d2dc99
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-13 (Sat, 13 Jul 2013)

  Changed paths:
    A dev/initdata/generate-commande.php
    R dev/initdata/generate-commande.php
    R dev/initdata/generate-facture.php
    A dev/initdata/generate-facture.php
    A dev/initdata/generate-produit.php
    R dev/initdata/generate-produit.php
    M dev/initdata/generate-propale.php
    A dev/initdata/generate-societe.php
    R dev/initdata/generate-societe.php
    M htdocs/admin/geoipmaxmind.php
    R htdocs/admin/pdf.php
    A htdocs/admin/pdf.php
    A htdocs/admin/proxy.php
    R htdocs/admin/proxy.php
    R htdocs/admin/sms.php
    A htdocs/admin/sms.php
    M htdocs/admin/system/perf.php
    A htdocs/admin/translation.php
    R htdocs/admin/translation.php
    R htdocs/admin/workflow.php
    A htdocs/admin/workflow.php
    M htdocs/compta/facture/impayees.php
    A htdocs/core/class/CSMSFile.class.php
    R htdocs/core/class/CSMSFile.class.php
    R htdocs/core/class/commondocgenerator.class.php
    A htdocs/core/class/commondocgenerator.class.php
    R htdocs/core/class/extrafields.class.php
    A htdocs/core/class/extrafields.class.php
    A htdocs/core/class/genericobject.class.php
    R htdocs/core/class/genericobject.class.php
    R htdocs/core/class/hookmanager.class.php
    A htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/html.formsms.class.php
    R htdocs/core/class/rssparser.class.php
    A htdocs/core/class/rssparser.class.php
    A htdocs/core/class/smtps.class.php
    R htdocs/core/class/smtps.class.php
    A htdocs/core/class/vcard.class.php
    R htdocs/core/class/vcard.class.php
    M htdocs/core/lib/files.lib.php
    A htdocs/core/triggers/interface_20_all_Logevents.class.php
    R htdocs/core/triggers/interface_20_all_Logevents.class.php
    A htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    R htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php
    A htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    R htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
    A htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    R htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
    A htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/core/triggers/interface_50_modNotification_Notification.class.php
    R htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    A htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    A htdocs/filefunc.inc.php
    R htdocs/filefunc.inc.php
    A htdocs/fourn/commande/index.php
    R htdocs/fourn/commande/index.php
    M htdocs/fourn/commande/liste.php
    M htdocs/includes/jquery/plugins/flot/Makefile
    M htdocs/master.inc.php

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


  Commit: 3f94950b0ee80dde16a7791dc051194159f3f65f
      
https://github.com/Dolibarr/dolibarr/commit/3f94950b0ee80dde16a7791dc051194159f3f65f
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-07-13 (Sat, 13 Jul 2013)

  Changed paths:
    M htdocs/fourn/class/fournisseur.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php

  Log Message:
  -----------
  Fix: Clean supplier ref


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b5820315f916...3f94950b0ee8