[Dolibarr-git] [Dolibarr/dolibarr] 342e26: Merge

[Laurent Destailleur]

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

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/compta/facture.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/includes/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tcpdf/README.TXT
    M htdocs/includes/tcpdf/composer.json
    M htdocs/includes/tcpdf/config/tcpdf_config.php
    R htdocs/includes/tcpdf/fonts/aealarabiya.ctg.z
    R htdocs/includes/tcpdf/fonts/aealarabiya.z
    R htdocs/includes/tcpdf/fonts/aefurat.ctg.z
    R htdocs/includes/tcpdf/fonts/aefurat.z
    M htdocs/includes/tcpdf/fonts/cid0cs.php
    M htdocs/includes/tcpdf/fonts/cid0ct.php
    M htdocs/includes/tcpdf/fonts/cid0jp.php
    M htdocs/includes/tcpdf/fonts/cid0kr.php
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
    R htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/unicover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/AUTHORS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/BUGS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/LICENSE
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/NEWS
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/README
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/langcover.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/status.txt
    A htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.34/unicover.txt
    M htdocs/includes/tcpdf/fonts/dejavusans.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusans.php
    M htdocs/includes/tcpdf/fonts/dejavusans.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansb.php
    M htdocs/includes/tcpdf/fonts/dejavusansb.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansbi.php
    M htdocs/includes/tcpdf/fonts/dejavusansbi.z
    A htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
    A htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
    A htdocs/includes/tcpdf/fonts/dejavusansextralight.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansi.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.z
    A htdocs/includes/tcpdf/fonts/dejavusansmono.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonob.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
    A htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
    R htdocs/includes/tcpdf/fonts/dejavuserifi.z
    R htdocs/includes/tcpdf/fonts/freefont-20100919/AUTHORS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/COPYING
    R htdocs/includes/tcpdf/fonts/freefont-20100919/CREDITS
    R htdocs/includes/tcpdf/fonts/freefont-20100919/ChangeLog
    R htdocs/includes/tcpdf/fonts/freefont-20100919/INSTALL
    R htdocs/includes/tcpdf/fonts/freefont-20100919/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/AUTHORS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/COPYING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/CREDITS
    A htdocs/includes/tcpdf/fonts/freefont-20120503/ChangeLog
    A htdocs/includes/tcpdf/fonts/freefont-20120503/INSTALL
    A htdocs/includes/tcpdf/fonts/freefont-20120503/README
    A htdocs/includes/tcpdf/fonts/freefont-20120503/TROUBLESHOOTING
    A htdocs/includes/tcpdf/fonts/freefont-20120503/USAGE
    M htdocs/includes/tcpdf/fonts/freemono.ctg.z
    M htdocs/includes/tcpdf/fonts/freemono.php
    M htdocs/includes/tcpdf/fonts/freemono.z
    M htdocs/includes/tcpdf/fonts/freemonob.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonob.php
    M htdocs/includes/tcpdf/fonts/freemonob.z
    M htdocs/includes/tcpdf/fonts/freemonobi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonobi.php
    M htdocs/includes/tcpdf/fonts/freemonobi.z
    M htdocs/includes/tcpdf/fonts/freemonoi.ctg.z
    M htdocs/includes/tcpdf/fonts/freemonoi.php
    M htdocs/includes/tcpdf/fonts/freemonoi.z
    M htdocs/includes/tcpdf/include/barcodes/datamatrix.php
    M htdocs/includes/tcpdf/include/barcodes/pdf417.php
    M htdocs/includes/tcpdf/include/sRGB.icc
    M htdocs/includes/tcpdf/include/tcpdf_colors.php
    M htdocs/includes/tcpdf/include/tcpdf_filters.php
    M htdocs/includes/tcpdf/include/tcpdf_font_data.php
    M htdocs/includes/tcpdf/include/tcpdf_fonts.php
    M htdocs/includes/tcpdf/include/tcpdf_images.php
    M htdocs/includes/tcpdf/include/tcpdf_static.php
    M htdocs/includes/tcpdf/tcpdf.php
    M htdocs/includes/tcpdf/tcpdf_autoconfig.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_1d.php
    M htdocs/includes/tcpdf/tcpdf_barcodes_2d.php
    M htdocs/includes/tcpdf/tcpdf_import.php
    M htdocs/includes/tcpdf/tcpdf_parser.php
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/product/price.php
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/consumption.php
    M htdocs/societe/price.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge