[Dolibarr-git] [Dolibarr/dolibarr] 4dd740: FIX : wrong test on dict.php

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4dd740fe2f4bb1f8da072180b3da731b0809dc62
      
https://github.com/Dolibarr/dolibarr/commit/4dd740fe2f4bb1f8da072180b3da731b0809dc62
  Author: gauthier <address@hidden>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  FIX : wrong test on dict.php


  Commit: 1f1c75adfb627d6e48543959ee8804bd84241359
      
https://github.com/Dolibarr/dolibarr/commit/1f1c75adfb627d6e48543959ee8804bd84241359
  Author: gauthier <address@hidden>
  Date:   2016-12-14 (Wed, 14 Dec 2016)

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  FIX : HT and TTC price should always be displayed together


  Commit: b3d5f40f375c2078bb9e8392500a447a162e5dd7
      
https://github.com/Dolibarr/dolibarr/commit/b3d5f40f375c2078bb9e8392500a447a162e5dd7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-18 (Sun, 18 Dec 2016)

  Changed paths:
    M htdocs/admin/dict.php

  Log Message:
  -----------
  Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test

FIX : wrong test on dict.php


  Commit: e0db9a8ca7084a49369d39abf31ee1a2f6f31c55
      
https://github.com/Dolibarr/dolibarr/commit/e0db9a8ca7084a49369d39abf31ee1a2f6f31c55
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-18 (Sun, 18 Dec 2016)

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  Merge pull request #6169 from 
atm-gauthier/FIX_ttc_and_ht_must_always_be_available

FIX : HT and TTC price should always be displayed together


  Commit: dbf96b8f5977fa44b2f268d0827fa8383fb7a96e
      
https://github.com/Dolibarr/dolibarr/commit/dbf96b8f5977fa44b2f268d0827fa8383fb7a96e
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-18 (Sun, 18 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php

  Log Message:
  -----------
  Log at wrong place


  Commit: 74e00c4d803a4da3e21c345445aac3b95db19243
      
https://github.com/Dolibarr/dolibarr/commit/74e00c4d803a4da3e21c345445aac3b95db19243
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php

  Log Message:
  -----------
  More comment and hidden option to solve problems when sending emails.


  Commit: 876722733aa721d03d9ce369cbdaaa67cf046e77
      
https://github.com/Dolibarr/dolibarr/commit/876722733aa721d03d9ce369cbdaaa67cf046e77
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/product/price.php

  Log Message:
  -----------
  Better fix to get localtax


  Commit: 0d1d68d5d9e3d87b7ee266bd7ba29de14cdc7186
      
https://github.com/Dolibarr/dolibarr/commit/0d1d68d5d9e3d87b7ee266bd7ba29de14cdc7186
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php

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

Conflicts:
        htdocs/admin/dict.php
        htdocs/product/price.php


  Commit: 3f5d67d4d69148ff178275ab7af3be8daaef1728
      
https://github.com/Dolibarr/dolibarr/commit/3f5d67d4d69148ff178275ab7af3be8daaef1728
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/product/price.php

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


  Commit: 0eded9a8b706abb982684903a754af3d15175607
      
https://github.com/Dolibarr/dolibarr/commit/0eded9a8b706abb982684903a754af3d15175607
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/product/price.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fc401a9c68a3...0eded9a8b706