[Dolibarr-git] [Dolibarr/dolibarr] c6991f: [ bug #1174 ] Product translated description not g...

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
      
https://github.com/Dolibarr/dolibarr/commit/c6991f97d40a3e710900dcb12bd9e06ef7e3f68c
  Author: Florian Henry <address@hidden>
  Date:   2013-12-01 (Sun, 01 Dec 2013)

  Changed paths:
    M ChangeLog
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  [ bug #1174 ] Product translated description not good into PDF
 Country


  Commit: 11efc207559f005ce8edaa8966821047ba29ad5b
      
https://github.com/Dolibarr/dolibarr/commit/11efc207559f005ce8edaa8966821047ba29ad5b
  Author: Florian Henry <address@hidden>
  Date:   2013-12-01 (Sun, 01 Dec 2013)

  Changed paths:
    M ChangeLog
    M build/makepack-dolibarr.pl
    M htdocs/cashdesk/validation_verif.php
    M htdocs/ecm/ajax/ecmdatabase.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ecm/index.php
    M htdocs/ecm/tpl/builddatabase.tpl.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fourn/commande/liste.php
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4

Conflicts:
        ChangeLog

Change-Id: I90f7ee62c65ef449c8ca43857d9743d0d953cf4b


  Commit: ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
      
https://github.com/Dolibarr/dolibarr/commit/ff9c84fd0e8fd6e1cd1939f77ad1a3145578e62a
  Author: Florian Henry <address@hidden>
  Date:   2013-12-01 (Sun, 01 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Better test for HTMLentities desc translation


  Commit: c0ef63fd746e99f31eb1870e5048108441d11c68
      
https://github.com/Dolibarr/dolibarr/commit/c0ef63fd746e99f31eb1870e5048108441d11c68
  Author: Florian Henry <address@hidden>
  Date:   2013-12-01 (Sun, 01 Dec 2013)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Bteer fix


  Commit: 1b38d36f2884a56e3e265f3cf6a1b099489d791f
      
https://github.com/Dolibarr/dolibarr/commit/1b38d36f2884a56e3e265f3cf6a1b099489d791f
  Author: Florian Henry <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Better Fix


  Commit: 1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
      
https://github.com/Dolibarr/dolibarr/commit/1ad1b25f6e6f19040d0eb559a6a8e2b312f5981f
  Author: Florian Henry <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  remove useless space


  Commit: 0907d81fcb816263ae2ddfc1b4b2179b492bde4a
      
https://github.com/Dolibarr/dolibarr/commit/0907d81fcb816263ae2ddfc1b4b2179b492bde4a
  Author: Florian Henry <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Avoid strpos bug if string is empty or null


  Commit: 3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
      
https://github.com/Dolibarr/dolibarr/commit/3e712c9c8c8f33a80d74ab04e965394aeea5d7b3
  Author: Florian Henry <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Finnaly make it works


  Commit: bc4cfd66dbd13c12f498527dcba108dd7abb64a7
      
https://github.com/Dolibarr/dolibarr/commit/bc4cfd66dbd13c12f498527dcba108dd7abb64a7
  Author: Florian Henry <address@hidden>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Fix: fix unsubscribe URL into mailing when sending manually (not by
script)


  Commit: c2a8967b52cf3b154be7d35fdec1eaa427156111
      
https://github.com/Dolibarr/dolibarr/commit/c2a8967b52cf3b154be7d35fdec1eaa427156111
  Author: Florian Henry <address@hidden>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Much better fix for translated product description into PDF


  Commit: d4c007a9094dfb1cb76e698f56e215a7cc347ccf
      
https://github.com/Dolibarr/dolibarr/commit/d4c007a9094dfb1cb76e698f56e215a7cc347ccf
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-12-04 (Wed, 04 Dec 2013)

  Changed paths:
    M ChangeLog
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/core/lib/pdf.lib.php

  Log Message:
  -----------
  Merge pull request #1335 from FHenry/3.4

[ bug #1174 ] Product translated description not good into PDF  Country


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4aea74d6fd78...d4c007a9094d