[Dolibarr-git] [Dolibarr/dolibarr] 7cc7e8: Fix ODT to PDF exec scripts path

[Laurent Destailleur]

  Branch: refs/heads/3.4
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7cc7e8392d8bdf09025724bd7a1336836c6329c4
      
https://github.com/Dolibarr/dolibarr/commit/7cc7e8392d8bdf09025724bd7a1336836c6329c4
  Author: Florian Henry <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  Fix ODT to PDF exec scripts path


  Commit: 83116b562776823307d91dfb1ef660b5f2567a80
      
https://github.com/Dolibarr/dolibarr/commit/83116b562776823307d91dfb1ef660b5f2567a80
  Author: Florian Henry <address@hidden>
  Date:   2013-06-17 (Mon, 17 Jun 2013)

  Changed paths:
    M htdocs/user/logout.php

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


  Commit: dc5db0c1379903054e1ebc8462568005acbb2fea
      
https://github.com/Dolibarr/dolibarr/commit/dc5db0c1379903054e1ebc8462568005acbb2fea
  Author: Florian Henry <address@hidden>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M htdocs/includes/odtphp/odf.php

  Log Message:
  -----------
  fix ODT to PDF script path


  Commit: cac7cbebd4e530a34873976297589d1a3eef60a9
      
https://github.com/Dolibarr/dolibarr/commit/cac7cbebd4e530a34873976297589d1a3eef60a9
  Author: Florian Henry <address@hidden>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/mails.lang
    M htdocs/langs/fr_FR/exports.lang
    M htdocs/langs/fr_FR/mails.lang

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


  Commit: 08e0e8244a9172445cc74b20658c8a6ea06438cb
      
https://github.com/Dolibarr/dolibarr/commit/08e0e8244a9172445cc74b20658c8a6ea06438cb
  Author: Florian Henry <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/contact/class/contact.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/search_page.php
    M htdocs/main.inc.php

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


  Commit: 835b8e9d7ed738dbcf1619be0a940c3a72bf46ef
      
https://github.com/Dolibarr/dolibarr/commit/835b8e9d7ed738dbcf1619be0a940c3a72bf46ef
  Author: Florian Henry <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M htdocs/langs/fr_FR/holiday.lang

  Log Message:
  -----------
  Fix trad holidays


  Commit: 035edc12ce48438b4ef5c1847e32ab0a572fc976
      
https://github.com/Dolibarr/dolibarr/commit/035edc12ce48438b4ef5c1847e32ab0a572fc976
  Author: Florian Henry <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Fix [ bug #945 ] error adding a service


  Commit: 6779724dc0e9568d7e5bb1ca2770ff77541aa52d
      
https://github.com/Dolibarr/dolibarr/commit/6779724dc0e9568d7e5bb1ca2770ff77541aa52d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M htdocs/includes/odtphp/odf.php
    M htdocs/langs/fr_FR/holiday.lang
    M htdocs/product/class/product.class.php

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

Fix ODT to PDF exec scripts path


Compare: 
https://github.com/Dolibarr/dolibarr/compare/09317e20343b...6779724dc0e9