[Dolibarr-git] [Dolibarr/dolibarr] a83479: New: Content of predefined email come firstly from...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a83479618188d00b43e52a5fc376b5130c6b71e0
      
https://github.com/Dolibarr/dolibarr/commit/a83479618188d00b43e52a5fc376b5130c6b71e0
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/html.formmail.class.php

  Log Message:
  -----------
  New: Content of predefined email come firstly from table
llx_c_email_template, then translation key.


  Commit: 6eb3fe1ae48f941fc4832e6781ef0c228a4cb97b
      
https://github.com/Dolibarr/dolibarr/commit/6eb3fe1ae48f941fc4832e6781ef0c228a4cb97b
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M htdocs/core/lib/company.lib.php
    R htdocs/societe/localtaxes.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d1879c1b9f82...6eb3fe1ae48f