[Dolibarr-git] [Dolibarr/dolibarr] 91a1c9: Merge branch 'develop' of add

dolibarr-git
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 91a1c9: Merge branch 'develop' of add

From:	Laurent Destailleur
Subject:	[Dolibarr-git] [Dolibarr/dolibarr] 91a1c9: Merge branch 'develop' of address@hidden:Dolibarr/...
Date:	Sun, 4 Dec 2011 10:43:18 -0800
  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr

  Commit: 91a1c903a03a8288a65bc3103159aba234fb1e1f
      
https://github.com/Dolibarr/dolibarr/commit/91a1c903a03a8288a65bc3103159aba234fb1e1f
  Author: Laurent Destailleur <address@hidden>
  Date:   2011-12-04 (Sun, 04 Dec 2011)

  Changed paths:
    M build/tgz/tar_exclude.txt
  M htdocs/core/lib/functions2.lib.php
  M htdocs/core/lib/pdf.lib.php
  M htdocs/core/lib/project.lib.php
  M htdocs/core/modules/commande/mod_commande_saphir.php
  M htdocs/core/modules/contract/mod_contract_magre.php
  M htdocs/core/modules/expedition/mod_expedition_ribera.php
  M htdocs/core/modules/facture/mod_facture_mercure.php
  M htdocs/core/modules/fichinter/mod_arctic.php
  M htdocs/core/modules/livraison/mod_livraison_saphir.php
  M htdocs/core/modules/project/mod_project_universal.php
  M htdocs/core/modules/propale/mod_propale_saphir.php
  M htdocs/core/modules/societe/mod_codeclient_elephant.php
  M htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
  M htdocs/expedition/fiche.php
  M htdocs/filefunc.inc.php
  R htdocs/includes/artichow/font/Tuffy.ttf
  R htdocs/includes/artichow/font/TuffyBold.ttf
  R htdocs/includes/artichow/font/TuffyBoldItalic.ttf
  R htdocs/includes/artichow/font/TuffyItalic.ttf
  M htdocs/includes/dolibarr_changes.txt
  A htdocs/includes/fonts/Tuffy.ttf
  A htdocs/includes/fonts/TuffyBold.ttf
  A htdocs/includes/fonts/TuffyBoldItalic.ttf
  A htdocs/includes/fonts/TuffyItalic.ttf
  R htdocs/includes/tcpdf/cache/chapter_demo_1.txt
  R htdocs/includes/tcpdf/cache/chapter_demo_2.txt
  R htdocs/includes/tcpdf/cache/table_data_demo.txt
  R htdocs/includes/tcpdf/cache/utf8test.txt
  R htdocs/includes/tcpdf/doc/classtrees_com-tecnick-tcpdf.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/PDF417.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/QRcode.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF2DBarcode.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDFBarcode.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/TCPDF_UNICODE_DATA.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_2dbarcodes.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_barcodes.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_config---tcpdf_config.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_htmlcolors.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_pdf417.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_qrcode.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_tcpdf.php.html
  R htdocs/includes/tcpdf/doc/com-tecnick-tcpdf/_unicode_data.php.html
  R htdocs/includes/tcpdf/doc/elementindex.html
  R htdocs/includes/tcpdf/doc/elementindex_com-tecnick-tcpdf.html
  R htdocs/includes/tcpdf/doc/errors.html
  R htdocs/includes/tcpdf/doc/index.html
  R htdocs/includes/tcpdf/doc/li_com-tecnick-tcpdf.html
  R htdocs/includes/tcpdf/doc/media/background.png
  R htdocs/includes/tcpdf/doc/media/empty.png
  R htdocs/includes/tcpdf/doc/media/style.css
  R htdocs/includes/tcpdf/fonts/almohanad.ctg.z
  R htdocs/includes/tcpdf/fonts/almohanad.php
  R htdocs/includes/tcpdf/fonts/almohanad.z
  R htdocs/includes/tcpdf/fonts/arialunicid0.php
  R htdocs/includes/tcpdf/fonts/chinese.php
  R htdocs/includes/tcpdf/fonts/courier.php
  R htdocs/includes/tcpdf/fonts/dejavusanscondensed.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensed.php
  R htdocs/includes/tcpdf/fonts/dejavusanscondensed.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedb.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedb.php
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedb.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.php
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedbi.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedi.php
  R htdocs/includes/tcpdf/fonts/dejavusanscondensedi.z
  R htdocs/includes/tcpdf/fonts/dejavusansextralight.php
  R htdocs/includes/tcpdf/fonts/dejavusansmono.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusansmono.php
  R htdocs/includes/tcpdf/fonts/dejavusansmono.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonob.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonob.php
  R htdocs/includes/tcpdf/fonts/dejavusansmonob.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonobi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonobi.php
  R htdocs/includes/tcpdf/fonts/dejavusansmonobi.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonoi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavusansmonoi.php
  R htdocs/includes/tcpdf/fonts/dejavusansmonoi.z
  R htdocs/includes/tcpdf/fonts/dejavuserif.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserif.php
  R htdocs/includes/tcpdf/fonts/dejavuserif.z
  R htdocs/includes/tcpdf/fonts/dejavuserifb.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifb.php
  R htdocs/includes/tcpdf/fonts/dejavuserifb.z
  R htdocs/includes/tcpdf/fonts/dejavuserifbi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifbi.php
  R htdocs/includes/tcpdf/fonts/dejavuserifbi.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensed.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensed.php
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensed.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.php
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedb.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.php
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedbi.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.php
  R htdocs/includes/tcpdf/fonts/dejavuserifcondensedi.z
  R htdocs/includes/tcpdf/fonts/dejavuserifi.ctg.z
  R htdocs/includes/tcpdf/fonts/dejavuserifi.php
  R htdocs/includes/tcpdf/fonts/dejavuserifi.z
  M htdocs/includes/tcpdf/fonts/freefont-20100919/AUTHORS
  M htdocs/includes/tcpdf/fonts/freefont-20100919/CREDITS
  M htdocs/includes/tcpdf/fonts/freefont-20100919/ChangeLog
  M htdocs/includes/tcpdf/fonts/freefont-20100919/INSTALL
  M htdocs/includes/tcpdf/fonts/freefont-20100919/README
  R htdocs/includes/tcpdf/fonts/freemono.ctg.z
  R htdocs/includes/tcpdf/fonts/freemono.z
  R htdocs/includes/tcpdf/fonts/freemonob.ctg.z
  R htdocs/includes/tcpdf/fonts/freemonob.z
  R htdocs/includes/tcpdf/fonts/freemonobi.ctg.z
  R htdocs/includes/tcpdf/fonts/freemonobi.z
  R htdocs/includes/tcpdf/fonts/freemonoi.ctg.z
  R htdocs/includes/tcpdf/fonts/freemonoi.z
  R htdocs/includes/tcpdf/fonts/freesans.ctg.z
  R htdocs/includes/tcpdf/fonts/freesans.php
  R htdocs/includes/tcpdf/fonts/freesans.z
  R htdocs/includes/tcpdf/fonts/freesansb.ctg.z
  R htdocs/includes/tcpdf/fonts/freesansb.php
  R htdocs/includes/tcpdf/fonts/freesansb.z
  R htdocs/includes/tcpdf/fonts/freesansbi.ctg.z
  R htdocs/includes/tcpdf/fonts/freesansbi.php
  R htdocs/includes/tcpdf/fonts/freesansbi.z
  R htdocs/includes/tcpdf/fonts/freesansi.ctg.z
  R htdocs/includes/tcpdf/fonts/freesansi.php
  R htdocs/includes/tcpdf/fonts/freesansi.z
  R htdocs/includes/tcpdf/fonts/freeserif.ctg.z
  R htdocs/includes/tcpdf/fonts/freeserif.php
  R htdocs/includes/tcpdf/fonts/freeserif.z
  R htdocs/includes/tcpdf/fonts/freeserifb.ctg.z
  R htdocs/includes/tcpdf/fonts/freeserifb.php
  R htdocs/includes/tcpdf/fonts/freeserifb.z
  R htdocs/includes/tcpdf/fonts/freeserifbi.ctg.z
  R htdocs/includes/tcpdf/fonts/freeserifbi.php
  R htdocs/includes/tcpdf/fonts/freeserifbi.z
  R htdocs/includes/tcpdf/fonts/freeserifi.ctg.z
  R htdocs/includes/tcpdf/fonts/freeserifi.php
  R htdocs/includes/tcpdf/fonts/freeserifi.z
  R htdocs/includes/tcpdf/fonts/hysmyeongjostdmedium.php
  R htdocs/includes/tcpdf/fonts/kozgopromedium.php
  R htdocs/includes/tcpdf/fonts/kozminproregular.php
  R htdocs/includes/tcpdf/fonts/msungstdlight.php
  R htdocs/includes/tcpdf/fonts/symbol.php
  R htdocs/includes/tcpdf/fonts/times.php
  R htdocs/includes/tcpdf/fonts/timesb.php
  R htdocs/includes/tcpdf/fonts/timesbi.php
  R htdocs/includes/tcpdf/fonts/timesi.php
  R htdocs/includes/tcpdf/fonts/uni2cid_ac15.php
  R htdocs/includes/tcpdf/fonts/uni2cid_ag15.php
  R htdocs/includes/tcpdf/fonts/uni2cid_aj16.php
  R htdocs/includes/tcpdf/fonts/uni2cid_ak12.php
  R htdocs/includes/tcpdf/fonts/utils/README.TXT
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1250.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1251.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1252.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1253.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1254.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1255.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1257.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp1258.map
  R htdocs/includes/tcpdf/fonts/utils/enc/cp874.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-1.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-11.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-15.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-16.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-2.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-4.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-5.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-7.map
  R htdocs/includes/tcpdf/fonts/utils/enc/iso-8859-9.map
  R htdocs/includes/tcpdf/fonts/utils/enc/koi8-r.map
  R htdocs/includes/tcpdf/fonts/utils/enc/koi8-u.map
  R htdocs/includes/tcpdf/fonts/utils/freetype6.dll
  R htdocs/includes/tcpdf/fonts/utils/makeallotfufm.php
  R htdocs/includes/tcpdf/fonts/utils/makeallttffonts.php
  R htdocs/includes/tcpdf/fonts/utils/makefont.php
  R htdocs/includes/tcpdf/fonts/utils/pfm2afm
  R htdocs/includes/tcpdf/fonts/utils/pfm2afm.exe
  R htdocs/includes/tcpdf/fonts/utils/src/pfm2afm-src.tar.gz
  R htdocs/includes/tcpdf/fonts/utils/src/readme.txt
  R htdocs/includes/tcpdf/fonts/utils/src/ttf2ufm-src.tar.gz
  R htdocs/includes/tcpdf/fonts/utils/ttf2ufm
  R htdocs/includes/tcpdf/fonts/utils/ttf2ufm.exe
  R htdocs/includes/tcpdf/fonts/utils/zlib1.dll
  R htdocs/includes/tcpdf/fonts/zapfdingbats.php
  R htdocs/includes/tcpdf/fonts/zarbold.php
  R htdocs/includes/tcpdf/images/_blank.png
  R htdocs/includes/tcpdf/images/alpha.png
  R htdocs/includes/tcpdf/images/bug.eps
  R htdocs/includes/tcpdf/images/image_demo.jpg
  R htdocs/includes/tcpdf/images/image_with_alpha.png
  R htdocs/includes/tcpdf/images/img.png
  R htdocs/includes/tcpdf/images/logo_example.gif
  R htdocs/includes/tcpdf/images/logo_example.jpg
  R htdocs/includes/tcpdf/images/logo_example.png
  R htdocs/includes/tcpdf/images/pelican.ai
  R htdocs/includes/tcpdf/images/tcpdf_cell.png
  R htdocs/includes/tcpdf/images/tcpdf_logo.jpg
  R htdocs/includes/tcpdf/images/tcpdf_signature.png
  R htdocs/includes/tcpdf/images/testsvg.svg
  R htdocs/includes/tcpdf/images/tiger.ai
  R htdocs/includes/tcpdf/images/tux.svg
  M htdocs/langs/en_US/admin.lang
  M htdocs/langs/fr_FR/admin.lang
  M htdocs/projet/activity/list.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
[Prev in Thread]
Current Thread
[Next in Thread]
[Dolibarr-git] [Dolibarr/dolibarr] 91a1c9: Merge branch 'develop' of address@hidden:Dolibarr/..., Laurent Destailleur <=
Prev by Date: [Dolibarr-git] [Dolibarr/dolibarr] a780f7: Fix: W3C
Next by Date: [Dolibarr-git] [Dolibarr/dolibarr] e6f359: Qual: Some code cleaning
Previous by thread: [Dolibarr-git] [Dolibarr/dolibarr] a780f7: Fix: W3C
Next by thread: [Dolibarr-git] [Dolibarr/dolibarr] e6f359: Qual: Some code cleaning
Index(es):
- Date
- Thread