[Dolibarr-git] [Dolibarr/dolibarr] f8e156: FIX: Email templates not compatible with Multicomp...

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f8e156ea3077eddbd9bfce237c947e5b7217b6c1
      
https://github.com/Dolibarr/dolibarr/commit/f8e156ea3077eddbd9bfce237c947e5b7217b6c1
  Author: fmarcet <address@hidden>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX: Email templates not compatible with Multicompany


  Commit: cebb996120064713c6a8975e0282883b7bfbacb7
      
https://github.com/Dolibarr/dolibarr/commit/cebb996120064713c6a8975e0282883b7bfbacb7
  Author: fmarcet <address@hidden>
  Date:   2015-12-29 (Tue, 29 Dec 2015)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX: Email templates not compatible with Multicompany


  Commit: cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
      
https://github.com/Dolibarr/dolibarr/commit/cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
  Author: fmarcet <address@hidden>
  Date:   2016-01-04 (Mon, 04 Jan 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX: Email templates not compatible with Multicompany


  Commit: d8360a2a0169886c3c9be771202be480db12b534
      
https://github.com/Dolibarr/dolibarr/commit/d8360a2a0169886c3c9be771202be480db12b534
  Author: fmarcet <address@hidden>
  Date:   2016-01-07 (Thu, 07 Jan 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX: Email templates not compatible with Multicompany


  Commit: 40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
      
https://github.com/Dolibarr/dolibarr/commit/40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #4321 from fmarcet/3.7

FIX: Email templates not compatible with Multicompany


Compare: 
https://github.com/Dolibarr/dolibarr/compare/e008922919b5...40f0d0c9f2bf