[Dolibarr-git] [Dolibarr/dolibarr] f218aa: fix : trad

[Regis Houssin]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f218aa0ec646241fe7c4dbb67107176153e5ef4e
      
https://github.com/Dolibarr/dolibarr/commit/f218aa0ec646241fe7c4dbb67107176153e5ef4e
  Author: Grand Philippe <address@hidden>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/members.lang

  Log Message:
  -----------
  fix : trad


  Commit: 548bbe78e658ef14852dd90c3e55ecefb9cedbfc
      
https://github.com/Dolibarr/dolibarr/commit/548bbe78e658ef14852dd90c3e55ecefb9cedbfc
  Author: Grand Philippe <address@hidden>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M build/debian/README.howto
    M build/debian/control
    M build/debian/control.debianbin
    M build/debian/dolibarr.postinst
    M build/debian/dolibarr.postrm
    M build/debian/install.forced.php.install
    M build/debian/rules
    M build/doxygen/jenkins_doxygen.doxyfile
    M build/rpm/dolibarr_fedora.spec
    M build/rpm/dolibarr_generic.spec
    M build/rpm/dolibarr_mandriva.spec
    M build/rpm/dolibarr_opensuse.spec
    M build/rpm/install.forced.php.opensuse
    M dev/dolibarr_changes.txt
    M dev/initdata/initdemo.sh
    A dev/initdata/mysqldump_dolibarr_3.2.0.sql
    M htdocs/adherents/card_subscriptions.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/document.php
    M htdocs/adherents/fiche.php
    M htdocs/adherents/index.php
    M htdocs/adherents/info.php
    M htdocs/adherents/note.php
    M htdocs/adherents/stats/geo.php
    M htdocs/adherents/stats/index.php
    M htdocs/adherents/type.php
    M htdocs/admin/contract.php
    M htdocs/admin/expedition.php
    M htdocs/admin/livraison.php
    M htdocs/admin/project.php
    M htdocs/admin/tools/purge.php
    M htdocs/admin/workflow.php
    M htdocs/categories/categorie.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/fiche.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/core/ajax/ajaxdirtree.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/infobox.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/commande/doc/pdf_edison.modules.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/contract/modules_contract.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/facture/doc/pdf_oursin.modules.php
    M htdocs/core/modules/livraison/mod_livraison_jade.php
    M htdocs/core/modules/livraison/mod_livraison_saphir.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/modules/modFournisseur.class.php
    M htdocs/core/modules/project/mod_project_simple.php
    M htdocs/core/modules/project/mod_project_universal.php
    M htdocs/core/modules/project/modules_project.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/propale/doc/pdf_jaune.modules.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/includes/tcpdf/2dbarcodes.php
    M htdocs/includes/tcpdf/CHANGELOG.TXT
    M htdocs/includes/tcpdf/LICENSE.TXT
    M htdocs/includes/tcpdf/README.TXT
    M htdocs/includes/tcpdf/barcodes.php
    M htdocs/includes/tcpdf/config/lang/afr.php
    M htdocs/includes/tcpdf/config/lang/ara.php
    M htdocs/includes/tcpdf/config/lang/aze.php
    M htdocs/includes/tcpdf/config/lang/bel.php
    M htdocs/includes/tcpdf/config/lang/bra.php
    A htdocs/includes/tcpdf/config/lang/bul.php
    M htdocs/includes/tcpdf/config/lang/cat.php
    M htdocs/includes/tcpdf/config/lang/ces.php
    M htdocs/includes/tcpdf/config/lang/chi.php
    M htdocs/includes/tcpdf/config/lang/cym.php
    M htdocs/includes/tcpdf/config/lang/dan.php
    M htdocs/includes/tcpdf/config/lang/eng.php
    M htdocs/includes/tcpdf/config/lang/est.php
    M htdocs/includes/tcpdf/config/lang/eus.php
    M htdocs/includes/tcpdf/config/lang/far.php
    M htdocs/includes/tcpdf/config/lang/fra.php
    M htdocs/includes/tcpdf/config/lang/ger.php
    M htdocs/includes/tcpdf/config/lang/gle.php
    M htdocs/includes/tcpdf/config/lang/glg.php
    M htdocs/includes/tcpdf/config/lang/hat.php
    M htdocs/includes/tcpdf/config/lang/heb.php
    M htdocs/includes/tcpdf/config/lang/hrv.php
    M htdocs/includes/tcpdf/config/lang/hun.php
    M htdocs/includes/tcpdf/config/lang/hye.php
    M htdocs/includes/tcpdf/config/lang/ind.php
    M htdocs/includes/tcpdf/config/lang/ita.php
    A htdocs/includes/tcpdf/config/lang/jpn.php
    M htdocs/includes/tcpdf/config/lang/kat.php
    M htdocs/includes/tcpdf/config/lang/kor.php
    M htdocs/includes/tcpdf/config/lang/mkd.php
    M htdocs/includes/tcpdf/config/lang/mlt.php
    M htdocs/includes/tcpdf/config/lang/msa.php
    M htdocs/includes/tcpdf/config/lang/nld.php
    M htdocs/includes/tcpdf/config/lang/nob.php
    M htdocs/includes/tcpdf/config/lang/pol.php
    M htdocs/includes/tcpdf/config/lang/por.php
    M htdocs/includes/tcpdf/config/lang/ron.php
    M htdocs/includes/tcpdf/config/lang/rus.php
    M htdocs/includes/tcpdf/config/lang/slv.php
    M htdocs/includes/tcpdf/config/lang/spa.php
    M htdocs/includes/tcpdf/config/lang/sqi.php
    M htdocs/includes/tcpdf/config/lang/srp.php
    M htdocs/includes/tcpdf/config/lang/swa.php
    M htdocs/includes/tcpdf/config/lang/swe.php
    M htdocs/includes/tcpdf/config/lang/urd.php
    M htdocs/includes/tcpdf/config/lang/yid.php
    M htdocs/includes/tcpdf/config/lang/zho.php
    M htdocs/includes/tcpdf/config/tcpdf_config.php
    M htdocs/includes/tcpdf/config/tcpdf_config_alt.php
    A htdocs/includes/tcpdf/datamatrix.php
    A htdocs/includes/tcpdf/encodings_maps.php
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/AUTHORS
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/BUGS
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/NEWS
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/README
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/langcover.txt
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/status.txt
    M htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33/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
    M htdocs/includes/tcpdf/fonts/dejavusansi.ctg.z
    M htdocs/includes/tcpdf/fonts/dejavusansi.php
    M htdocs/includes/tcpdf/fonts/dejavusansi.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
    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/fonts/helvetica.php
    M htdocs/includes/tcpdf/fonts/helveticab.php
    M htdocs/includes/tcpdf/fonts/helveticabi.php
    M htdocs/includes/tcpdf/fonts/helveticai.php
    M htdocs/includes/tcpdf/htmlcolors.php
    M htdocs/includes/tcpdf/pdf417.php
    M htdocs/includes/tcpdf/qrcode.php
    A htdocs/includes/tcpdf/sRGB.icc
    M htdocs/includes/tcpdf/spotcolors.php
    M htdocs/includes/tcpdf/tcpdf.php
    A htdocs/includes/tcpdf/tcpdf_filters.php
    A htdocs/includes/tcpdf/tcpdf_parser.php
    M htdocs/includes/tcpdf/unicode_data.php
    M htdocs/install/check.php
    M htdocs/install/etape1.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/data/llx_c_forme_juridique.sql
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/install/mysql/data/llx_const.sql
    A htdocs/install/mysql/migration/3.2.0-3.3.0.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/es_ES/mails.lang
    M htdocs/langs/fr_FR/mails.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/projet/class/project.class.php
    M htdocs/theme/dolibarr_logo.png
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php
    M quickbuild.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'dolibarr/develop' into develop


  Commit: d79c8a3fa1a399dc9c097901b08a638410063672
      
https://github.com/Dolibarr/dolibarr/commit/d79c8a3fa1a399dc9c097901b08a638410063672
  Author: Grand Philippe <address@hidden>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql

  Log Message:
  -----------
  change from cloture to approve and complete function approve


  Commit: f85eced62d339b8578defe03f90bab5c0ea0b8eb
      
https://github.com/Dolibarr/dolibarr/commit/f85eced62d339b8578defe03f90bab5c0ea0b8eb
  Author: Regis Houssin <address@hidden>
  Date:   2012-04-15 (Sun, 15 Apr 2012)

  Changed paths:
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/install/mysql/tables/llx_commande_fournisseur.sql
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/members.lang

  Log Message:
  -----------
  Merge pull request #167 from grandoc/develop

fix : trad


Compare: https://github.com/Dolibarr/dolibarr/compare/bf83891...f85eced