[Dolibarr-git] [Dolibarr/dolibarr] a7d03a: Fix sending emails from mergepedtool was just doin...

[Laurent Destailleur]

  Branch: refs/heads/3.8
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a7d03af4afdbd2cfe8bd3990ce98e9f9d330b0b4
      
https://github.com/Dolibarr/dolibarr/commit/a7d03af4afdbd2cfe8bd3990ce98e9f9d330b0b4
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/compta/facture/mergepdftool.php

  Log Message:
  -----------
  Fix sending emails from mergepedtool was just doing wrong things.


  Commit: 64e35255ae950e5c89827b7092525c876d3ec746
      
https://github.com/Dolibarr/dolibarr/commit/64e35255ae950e5c89827b7092525c876d3ec746
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-12-03 (Thu, 03 Dec 2015)

  Changed paths:
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/tpl/objectline_create.tpl.php
    M htdocs/product/class/product.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/list.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/c86d4b51b1d8...64e35255ae95