dolibarr-git
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-git] [Dolibarr/dolibarr] 1a9e98: Fix categories bug


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] 1a9e98: Fix categories bug
Date: Sun, 07 Sep 2014 04:19:12 -0700

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
      
https://github.com/Dolibarr/dolibarr/commit/1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Fix categories bug

When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.


  Commit: 739d309a0d3e38becd20c28bf07e41078fcf49c7
      
https://github.com/Dolibarr/dolibarr/commit/739d309a0d3e38becd20c28bf07e41078fcf49c7
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Updated category fix

Categories ID can be passed as strings
PSR code formatting


  Commit: f5883741bf2a94995a5df419bf887e482fca5b2e
      
https://github.com/Dolibarr/dolibarr/commit/f5883741bf2a94995a5df419bf887e482fca5b2e
  Author: braito4 <address@hidden>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Update fiche.php

Proyect selection was missing


  Commit: 2c68317864a424d0ef88b6aa2dce1ce7ad544b37
      
https://github.com/Dolibarr/dolibarr/commit/2c68317864a424d0ef88b6aa2dce1ce7ad544b37
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

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

  Log Message:
  -----------
  Fix : bad sql request when linking resource to an element


  Commit: 71afc4adb0a84f8acc430ca9eaf6cf7b13576381
      
https://github.com/Dolibarr/dolibarr/commit/71afc4adb0a84f8acc430ca9eaf6cf7b13576381
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Fix : missing actions for resource element


  Commit: b7a2e3783ebe050271692bc671cc4882e55ccadd
      
https://github.com/Dolibarr/dolibarr/commit/b7a2e3783ebe050271692bc671cc4882e55ccadd
  Author: jfefe <address@hidden>
  Date:   2014-08-30 (Sat, 30 Aug 2014)

  Changed paths:
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang

  Log Message:
  -----------
  Fix : missing translations


  Commit: 67b308cb2549550777d76551800db94c4cf2b3d0
      
https://github.com/Dolibarr/dolibarr/commit/67b308cb2549550777d76551800db94c4cf2b3d0
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Fix: list event view lost type event filter


  Commit: c8a9f4600c57d237c4f484b0922830fc7bc79de2
      
https://github.com/Dolibarr/dolibarr/commit/c8a9f4600c57d237c4f484b0922830fc7bc79de2
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Fix: list event view lost type event filter


  Commit: 0dd955875c6fc7b9db05c782ff654c4bb137666d
      
https://github.com/Dolibarr/dolibarr/commit/0dd955875c6fc7b9db05c782ff654c4bb137666d
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Log Message:
  -----------
  Merge branch '3.6' of address@hidden:Dolibarr/dolibarr.git into 3.6


  Commit: 911aca399ddad5ecc9ebe7100eff5f89d31687f4
      
https://github.com/Dolibarr/dolibarr/commit/911aca399ddad5ecc9ebe7100eff5f89d31687f4
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  save code event


  Commit: 832d1b37c12709757a8c9ddca988ea862614820f
      
https://github.com/Dolibarr/dolibarr/commit/832d1b37c12709757a8c9ddca988ea862614820f
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  Save also code of event


  Commit: 576512e339fe1c5caf16a57dbc9a0ed8355ea827
      
https://github.com/Dolibarr/dolibarr/commit/576512e339fe1c5caf16a57dbc9a0ed8355ea827
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Merge pull request #1815 from GPCsolutions/catbug

Fix categories bug


  Commit: 0bc511a6260d788cfb3bfddcd644663ce61b7624
      
https://github.com/Dolibarr/dolibarr/commit/0bc511a6260d788cfb3bfddcd644663ce61b7624
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Merge pull request #1850 from braito4/patch-1

Update fiche.php


  Commit: 660557b4dd7cc64bc3dddb3e980978b6eab28921
      
https://github.com/Dolibarr/dolibarr/commit/660557b4dd7cc64bc3dddb3e980978b6eab28921
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Merge pull request #1862 from FHenry/3.5

Fix: list event view lost type event filter


  Commit: 257d7c41d64b9e575f31f9a300642422dff32bbb
      
https://github.com/Dolibarr/dolibarr/commit/257d7c41d64b9e575f31f9a300642422dff32bbb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Merge pull request #1863 from FHenry/3.6

 Fix: list event view lost type event filter


  Commit: 80968bc087b4333d15b489777e5ee4e37a366c72
      
https://github.com/Dolibarr/dolibarr/commit/80968bc087b4333d15b489777e5ee4e37a366c72
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php

  Log Message:
  -----------
  Merge pull request #1857 from aternatik/resource-fix

Fixes for resource module


  Commit: f7c48558e6d2d17bf6f0f885ab76b9b87967137d
      
https://github.com/Dolibarr/dolibarr/commit/f7c48558e6d2d17bf6f0f885ab76b9b87967137d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/product/price.php

  Log Message:
  -----------
  Fix: balance with td


  Commit: 165856656a366ee48f8c755c0742286fc14f160a
      
https://github.com/Dolibarr/dolibarr/commit/165856656a366ee48f8c755c0742286fc14f160a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/societe/price.php

  Log Message:
  -----------
  Fix: balance with td


  Commit: bd99f3943df513830407cc98577fcaff635ae91e
      
https://github.com/Dolibarr/dolibarr/commit/bd99f3943df513830407cc98577fcaff635ae91e
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Payment VAT :: Add control on field required


  Commit: 4e05afdd6682d7fcebc4958fb8d6c0c87588ca61
      
https://github.com/Dolibarr/dolibarr/commit/4e05afdd6682d7fcebc4958fb8d6c0c87588ca61
  Author: aspangaro <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M htdocs/compta/salaries/fiche.php

  Log Message:
  -----------
  Payment Salaries :: Add field required & control on it


  Commit: 395209a5dbaee724a516e2958d505deaa56212dd
      
https://github.com/Dolibarr/dolibarr/commit/395209a5dbaee724a516e2958d505deaa56212dd
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/compta/facture/prelevement.php

  Log Message:
  -----------
  Fix: Reason to have button greyed is wrong

Conflicts:
        htdocs/compta/facture/prelevement.php


  Commit: b88b4fbc2cbf1f50852aa7ac2be6b8ae1415e126
      
https://github.com/Dolibarr/dolibarr/commit/b88b4fbc2cbf1f50852aa7ac2be6b8ae1415e126
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php

  Log Message:
  -----------
  Fix: bad balance of td


  Commit: da8a1cb47507cfcb2fea6888b8166c71df5fdf0c
      
https://github.com/Dolibarr/dolibarr/commit/da8a1cb47507cfcb2fea6888b8166c71df5fdf0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Fix: Iban was used instead of Bic into SEPA file.
Fix: Must unaccent strings into SEPA file.


  Commit: cd00ec29bf6f307c74d301599f4fcbb3ce757ef9
      
https://github.com/Dolibarr/dolibarr/commit/cd00ec29bf6f307c74d301599f4fcbb3ce757ef9
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  Fix: Dictionnary with one n

Conflicts:
        htdocs/expedition/fiche.php


  Commit: 643fc6c61f8ae7ea4d726be32a2a68ec54f185c3
      
https://github.com/Dolibarr/dolibarr/commit/643fc6c61f8ae7ea4d726be32a2a68ec54f185c3
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/contrat/fiche.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php

  Log Message:
  -----------
  Fix: Bad use of fetch_lines

Conflicts:
        htdocs/comm/propal.php
        htdocs/contrat/fiche.php
        htdocs/opensurvey/class/opensurveysondage.class.php


  Commit: e4bff59f1a239339814f4f1a14665ce35fa81b6d
      
https://github.com/Dolibarr/dolibarr/commit/e4bff59f1a239339814f4f1a14665ce35fa81b6d
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Fix: pgsql compatibility. No upper cas into field names.


  Commit: 0e944b0403f1cc846db32806257bb48a29d188d7
      
https://github.com/Dolibarr/dolibarr/commit/0e944b0403f1cc846db32806257bb48a29d188d7
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

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

  Log Message:
  -----------
  Fix: Pb with week position when week start on sunday.


  Commit: 71832b594498f9870c5b6c879e2505882200a801
      
https://github.com/Dolibarr/dolibarr/commit/71832b594498f9870c5b6c879e2505882200a801
  Author: aspangaro <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Changelog


  Commit: f054d624cdf4b1e74f926bdcbc934778e7305f3a
      
https://github.com/Dolibarr/dolibarr/commit/f054d624cdf4b1e74f926bdcbc934778e7305f3a
  Author: aspangaro <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/fiche.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/expedition/fiche.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php
    M htdocs/opensurvey/class/opensurveysondage.class.php
    M htdocs/opensurvey/public/studs.php
    M htdocs/opensurvey/results.php
    M htdocs/societe/consumption.php

  Log Message:
  -----------
  Merge branch 'Upstream/3.6'


  Commit: 104df1d16d7662c24dfdc0baefb87b9244842aa2
      
https://github.com/Dolibarr/dolibarr/commit/104df1d16d7662c24dfdc0baefb87b9244842aa2
  Author: Juanjo Menent <address@hidden>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/salaries/fiche.php
    M htdocs/compta/tva/fiche.php

  Log Message:
  -----------
  Merge pull request #1866 from aspangaro/3.6

Payment VAT & Salaries :: Add controls on field required


  Commit: 2b9b110f9cbc9fabbedf6426dcad58add69023a6
      
https://github.com/Dolibarr/dolibarr/commit/2b9b110f9cbc9fabbedf6426dcad58add69023a6
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: Filter on direction of payment mode was not working.

Conflicts:
        htdocs/compta/facture.php
        htdocs/core/class/html.form.class.php
        htdocs/fourn/facture/fiche.php


  Commit: 522b5a91bc8d9b7a87bbf2269384725b29d3202a
      
https://github.com/Dolibarr/dolibarr/commit/522b5a91bc8d9b7a87bbf2269384725b29d3202a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: Filter on direction of payment mode was not working.

Conflicts:
        htdocs/core/class/html.form.class.php
        htdocs/fourn/facture/fiche.php


  Commit: 31eb4bda8876b88ef6bf5e988d001eeba5994801
      
https://github.com/Dolibarr/dolibarr/commit/31eb4bda8876b88ef6bf5e988d001eeba5994801
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
        htdocs/categories/class/categorie.class.php
        htdocs/compta/facture.php


  Commit: 6d9cc15856f3372cc1219d1c7969386a0beefd20
      
https://github.com/Dolibarr/dolibarr/commit/6d9cc15856f3372cc1219d1c7969386a0beefd20
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Fix: Function unaccent was not enough complete.


  Commit: 996977a4a881029481770e4c56aeaeba2cd24211
      
https://github.com/Dolibarr/dolibarr/commit/996977a4a881029481770e4c56aeaeba2cd24211
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/compta/deplacement/list.php

  Log Message:
  -----------
  Fix: Missing user name


  Commit: 5a93a7620c3a79bce7d34b011e49c13a278e8f10
      
https://github.com/Dolibarr/dolibarr/commit/5a93a7620c3a79bce7d34b011e49c13a278e8f10
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M COPYRIGHT
    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

  Log Message:
  -----------
  Upgrade tcpdf to 6.0.093 to get fixes and solve a problem of licence.


  Commit: 0cefe5af432f5d663793419ca23f621d40a33984
      
https://github.com/Dolibarr/dolibarr/commit/0cefe5af432f5d663793419ca23f621d40a33984
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-07 (Sun, 07 Sep 2014)

  Changed paths:
    M htdocs/comm/action/listactions.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/product/class/product.class.php
    M htdocs/product/price.php

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

Conflicts:
        htdocs/comm/action/listactions.php
        htdocs/compta/prelevement/class/bonprelevement.class.php
        htdocs/core/lib/date.lib.php
        htdocs/fourn/facture/fiche.php
        htdocs/includes/tcpdf/include/tcpdf_static.php
        htdocs/product/price.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/97c9d6bafc74...0cefe5af432f

reply via email to

[Prev in Thread] Current Thread [Next in Thread]