dolibarr-git
[Top][All Lists]
Advanced

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

[Dolibarr-git] [Dolibarr/dolibarr] c43b5f: Works on jQuery fileupload up


From: Laurent Destailleur
Subject: [Dolibarr-git] [Dolibarr/dolibarr] c43b5f: Works on jQuery fileupload upgrade (Todo: css prob...
Date: Thu, 30 Aug 2012 02:14:31 -0700

  Branch: refs/heads/master
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c43b5f99ac72f9c17e635f3f68029cacb80f78d2
      
https://github.com/Dolibarr/dolibarr/commit/c43b5f99ac72f9c17e635f3f68029cacb80f78d2
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/tpl/ajax/fileupload_main.tpl.php
    A htdocs/core/tpl/ajax/fileupload_view.tpl.php
    R htdocs/core/tpl/ajaxfileupload.tpl.php
    M htdocs/includes/jquery/plugins/fileupload/README.md
    R htdocs/includes/jquery/plugins/fileupload/README.txt
    A htdocs/includes/jquery/plugins/fileupload/css/bootstrap.min.css
    A htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
    A 
htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings-white.png
    A htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings.png
    A htdocs/includes/jquery/plugins/fileupload/img/loading.gif
    A htdocs/includes/jquery/plugins/fileupload/img/progressbar.gif
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.css
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload-ui.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.fileupload.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.iframe-transport.js
    R htdocs/includes/jquery/plugins/fileupload/jquery.tmpl.min.js
    A htdocs/includes/jquery/plugins/fileupload/js/bootstrap.min.js
    A 
htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.postmessage-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/cors/jquery.xdr-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-fp.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js
    A htdocs/includes/jquery/plugins/fileupload/js/main.js
    A htdocs/includes/jquery/plugins/fileupload/js/vendor/jquery.ui.widget.js
    R htdocs/includes/jquery/plugins/fileupload/pbar-ani.gif
    A htdocs/includes/jquery/plugins/template/README.md
    A htdocs/includes/jquery/plugins/template/compile.js
    A htdocs/includes/jquery/plugins/template/runtime.js
    A htdocs/includes/jquery/plugins/template/tmpl.js
    A htdocs/includes/jquery/plugins/template/tmpl.min.js
    M htdocs/main.inc.php

  Log Message:
  -----------
  Works on jQuery fileupload upgrade (Todo: css problem)


  Commit: bef5b66daba5f62fdc3ca4f0e135af9c7447565d
      
https://github.com/Dolibarr/dolibarr/commit/bef5b66daba5f62fdc3ca4f0e135af9c7447565d
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    R htdocs/includes/jquery/plugins/fileupload/css/bootstrap.min.css
    M htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
    R 
htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings-white.png
    R htdocs/includes/jquery/plugins/fileupload/img/glyphicons-halflings.png
    R htdocs/includes/jquery/plugins/fileupload/js/bootstrap.min.js
    A htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-jui.js
    A htdocs/includes/jquery/plugins/fileupload/js/locale.js
    M htdocs/includes/jquery/plugins/fileupload/js/main.js
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: replace Bootstrap version by jQueryUI version


  Commit: 8c4ddb99be5049936edace880707de4098338ff7
      
https://github.com/Dolibarr/dolibarr/commit/8c4ddb99be5049936edace880707de4098338ff7
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

  Log Message:
  -----------
  Fix: add max file size


  Commit: 1649a9a1b1b38575cc1f37d592b266a4d73bf85f
      
https://github.com/Dolibarr/dolibarr/commit/1649a9a1b1b38575cc1f37d592b266a4d73bf85f
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

  Log Message:
  -----------
  Fix: reload page after file upload completed


  Commit: a04ca9449a7bc4a78aa89b0fef03eca0a869dc99
      
https://github.com/Dolibarr/dolibarr/commit/a04ca9449a7bc4a78aa89b0fef03eca0a869dc99
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M COPYRIGHT
    M htdocs/includes/jquery/css/redmond/images/ui-bg_flat_55_fbec88_40x100.png
    M 
htdocs/includes/jquery/css/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    M 
htdocs/includes/jquery/css/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png
    M htdocs/includes/jquery/css/redmond/images/ui-icons_d8e7f3_256x240.png
    M htdocs/includes/jquery/css/redmond/jquery-ui-latest.custom.css
    M htdocs/includes/jquery/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M htdocs/includes/jquery/css/smoothness/jquery-ui-latest.custom.css
    M htdocs/includes/jquery/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
    M htdocs/includes/jquery/css/ui-lightness/jquery-ui-latest.custom.css
    M htdocs/includes/jquery/js/jquery-latest.min.jgz
    M htdocs/includes/jquery/js/jquery-latest.min.js
    M htdocs/includes/jquery/js/jquery-ui-latest.custom.min.jgz
    M htdocs/includes/jquery/js/jquery-ui-latest.custom.min.js

  Log Message:
  -----------
  New: update jQuery and jQuery UI


  Commit: 1f4be4cfedf5169a759bbe20b2403962cb2d6ad5
      
https://github.com/Dolibarr/dolibarr/commit/1f4be4cfedf5169a759bbe20b2403962cb2d6ad5
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M htdocs/adherents/document.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/compta/facture/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php

  Log Message:
  -----------
  Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload


  Commit: aee1c3b06931141f0140c2600cc7b3a5a2140631
      
https://github.com/Dolibarr/dolibarr/commit/aee1c3b06931141f0140c2600cc7b3a5a2140631
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M htdocs/core/ajax/fileupload.php
    A htdocs/core/class/fileupload.class.php
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php
    M htdocs/core/tpl/ajax/fileupload_view.tpl.php
    M htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css

  Log Message:
  -----------
  Fix: more clean code for new version of jQuery fileupload


  Commit: 92bb9c99f5620482e05bee4030c19a0794e69d57
      
https://github.com/Dolibarr/dolibarr/commit/92bb9c99f5620482e05bee4030c19a0794e69d57
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-07 (Thu, 07 Jun 2012)

  Changed paths:
    M build/makepack-dolibarr.pl
    M htdocs/filefunc.inc.php
    M htdocs/install/inc.php

  Log Message:
  -----------
  Release 3.2.1-alpha


  Commit: 6f28b698049229d989ef42014c9301f74ade0691
      
https://github.com/Dolibarr/dolibarr/commit/6f28b698049229d989ef42014c9301f74ade0691
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php
    A htdocs/includes/jquery/plugins/fileupload/cors/result.html
    M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: add iframe transport for compatibility with all browser


  Commit: 176c6013ecf7e196cc9eb81a620b90091562fe12
      
https://github.com/Dolibarr/dolibarr/commit/176c6013ecf7e196cc9eb81a620b90091562fe12
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

  Log Message:
  -----------
  Fix: bad option name


  Commit: 1c3bf3bb221afa6d74604c2332a03b3606fa650b
      
https://github.com/Dolibarr/dolibarr/commit/1c3bf3bb221afa6d74604c2332a03b3606fa650b
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/product/class/product.class.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 1b19fddbc62243ca660908d4988ea1555793ea90
      
https://github.com/Dolibarr/dolibarr/commit/1b19fddbc62243ca660908d4988ea1555793ea90
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

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

  Log Message:
  -----------
  Fix: missing oldcopy during update


  Commit: c51258567095fbb45bdc12d8aecf81e5d38a00ef
      
https://github.com/Dolibarr/dolibarr/commit/c51258567095fbb45bdc12d8aecf81e5d38a00ef
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

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

  Log Message:
  -----------
  Fix: delete or rename a document product dir


  Commit: db148c4233e85fe785560c55992a40428554878e
      
https://github.com/Dolibarr/dolibarr/commit/db148c4233e85fe785560c55992a40428554878e
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-08 (Fri, 08 Jun 2012)

  Changed paths:
    M htdocs/langs/en_US/products.lang
    M htdocs/langs/fr_FR/products.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/stocks.lang
    M htdocs/product/class/product.class.php
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: c9c4ba2a72235b591ca053c4062082b01c993912
      
https://github.com/Dolibarr/dolibarr/commit/c9c4ba2a72235b591ca053c4062082b01c993912
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-09 (Sat, 09 Jun 2012)

  Changed paths:
    M htdocs/comm/propal/document.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/document.php
    M htdocs/contrat/fiche.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/document.php
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Fix: problem with external modules and uniformize code

Conflicts:
        htdocs/comm/propal/document.php
        htdocs/core/class/fileupload.class.php
        htdocs/projet/fiche.php

Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4


  Commit: eef50058b11686dc4a49531d117786ad68a7db0e
      
https://github.com/Dolibarr/dolibarr/commit/eef50058b11686dc4a49531d117786ad68a7db0e
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M htdocs/contrat/class/contrat.class.php
    M htdocs/contrat/fiche.php
    M test/phpunit/ContratTest.php

  Log Message:
  -----------
  Fix: bad parameters, use global


  Commit: c9be1cbb8bfb996c02f8adfa3c8a2a926ce408fe
      
https://github.com/Dolibarr/dolibarr/commit/c9be1cbb8bfb996c02f8adfa3c8a2a926ce408fe
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-10 (Sun, 10 Jun 2012)

  Changed paths:
    M htdocs/comm/propal.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/societe/soc.php

  Log Message:
  -----------
  Fix: missing remove_file action
Fix: use object instead id and store odt filename in object for use in
triggers


  Commit: fb15ea20c66c167b85712c51448dd7f3e9ed91ed
      
https://github.com/Dolibarr/dolibarr/commit/fb15ea20c66c167b85712c51448dd7f3e9ed91ed
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M htdocs/includes/jquery/plugins/jstree/jquery.cookie.js

  Log Message:
  -----------
  Fix: update jquery-cookie plugin


  Commit: 548266d6071b9898c9740db27107ca5a4ca55f7f
      
https://github.com/Dolibarr/dolibarr/commit/548266d6071b9898c9740db27107ca5a4ca55f7f
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-11 (Mon, 11 Jun 2012)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/document.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/fiche.php

  Log Message:
  -----------
  Fix: uniformize code


  Commit: c4fbdbbce484ffb3f8846aee5e336ddfee2a3f8c
      
https://github.com/Dolibarr/dolibarr/commit/c4fbdbbce484ffb3f8846aee5e336ddfee2a3f8c
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-12 (Tue, 12 Jun 2012)

  Changed paths:
    M htdocs/core/class/doleditor.class.php
    M htdocs/core/js/editinplace.js
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: mutualize ckeditor parameters


  Commit: 707bffd1818656f1b27b198eafb4e1a83fb83b00
      
https://github.com/Dolibarr/dolibarr/commit/707bffd1818656f1b27b198eafb4e1a83fb83b00
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-13 (Wed, 13 Jun 2012)

  Changed paths:
    M htdocs/admin/fckeditor.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/langs/ca_ES/products.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/es_ES/products.lang

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 9b1047eea7d3a7f03f010f583f06f34e457b7fa7
      
https://github.com/Dolibarr/dolibarr/commit/9b1047eea7d3a7f03f010f583f06f34e457b7fa7
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M htdocs/comm/action/index.php
    M htdocs/comm/propal/index.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/commande/index.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
    M htdocs/societe/soc.php
    M htdocs/user/clicktodial.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1


  Commit: d941d1efeeded6ac0582a360ff0dbe681edfc2fa
      
https://github.com/Dolibarr/dolibarr/commit/d941d1efeeded6ac0582a360ff0dbe681edfc2fa
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ChangeLog
    M build/debian/changelog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-howto.txt
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    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 htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/core/lib/json.lib.php
    M htdocs/imports/class/import.class.php
    M htdocs/imports/emptyexample.php
    M htdocs/install/inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M scripts/invoices/rebuild_merge_pdf.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
        build/makepack-dolibarr.pl
        htdocs/filefunc.inc.php
        htdocs/install/inc.php


  Commit: 56f7d31d112049096f04115bb4a07b1ff11a0330
      
https://github.com/Dolibarr/dolibarr/commit/56f7d31d112049096f04115bb4a07b1ff11a0330
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M htdocs/master.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 3164b5615caa08a6c339c9e34206f6fa6c7c33d7
      
https://github.com/Dolibarr/dolibarr/commit/3164b5615caa08a6c339c9e34206f6fa6c7c33d7
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/admin/workflow.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/modules/action/rapport.pdf.php
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 11f78c1913b2e47ff9ff394c5db9ced326cc3c94
      
https://github.com/Dolibarr/dolibarr/commit/11f78c1913b2e47ff9ff394c5db9ced326cc3c94
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M htdocs/theme/auguria/ckeditor/config.js
    M htdocs/theme/bureau2crea/ckeditor/config.js
    M htdocs/theme/cameleo/ckeditor/config.js
    M htdocs/theme/eldy/ckeditor/config.js

  Log Message:
  -----------
  Fix: add ckeditor create div option with dolibarr_mailings toolbar


  Commit: 87f2ec663db0cabeb486e8f8b7abe5d07403a2bb
      
https://github.com/Dolibarr/dolibarr/commit/87f2ec663db0cabeb486e8f8b7abe5d07403a2bb
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M htdocs/core/modules/societe/mod_codecompta_panicum.php
    A htdocs/install/lib/repair.lib.php
    M htdocs/install/repair.php
    M htdocs/langs/fr_FR/install.lang
    M htdocs/product/fiche.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 123b45aa4b099aad17335f8982eb35cfa6c4d767
      
https://github.com/Dolibarr/dolibarr/commit/123b45aa4b099aad17335f8982eb35cfa6c4d767
  Author: Regis Houssin <address@hidden>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M htdocs/install/lib/repair.lib.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: b632c2233bf7d7a177ee6b097df5aaa5870b420c
      
https://github.com/Dolibarr/dolibarr/commit/b632c2233bf7d7a177ee6b097df5aaa5870b420c
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss
    M build/pad/pad_doliwamp.xml
    M htdocs/contact/class/contact.class.php
    M htdocs/expedition/index.php
    M htdocs/fourn/facture/document.php
    M htdocs/index.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1


  Commit: cd3df1d6e1c3ec07d9124e73429611ba66983955
      
https://github.com/Dolibarr/dolibarr/commit/cd3df1d6e1c3ec07d9124e73429611ba66983955
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M htdocs/core/lib/pdf.lib.php
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/fr_FR/contracts.lang

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 067a9b0820e9bd74dc24d358d362855e19e42af1
      
https://github.com/Dolibarr/dolibarr/commit/067a9b0820e9bd74dc24d358d362855e19e42af1
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

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

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
        htdocs/product/class/product.class.php


  Commit: 92858a7b47243f5bb58283d017e2bed1613ca253
      
https://github.com/Dolibarr/dolibarr/commit/92858a7b47243f5bb58283d017e2bed1613ca253
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/expedition/fiche.php
    M htdocs/expedition/index.php
    M htdocs/livraison/class/livraison.class.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 3e30cde02eba9d66f878ea0365aab86f8b024ad6
      
https://github.com/Dolibarr/dolibarr/commit/3e30cde02eba9d66f878ea0365aab86f8b024ad6
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M htdocs/adherents/agenda.php
    M htdocs/core/lib/security.lib.php
    M htdocs/langs/ca_ES/contracts.lang
    M htdocs/langs/ca_ES/install.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/install.lang

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 7f021ad5d9d259e1f18494ebc3a92be201041b90
      
https://github.com/Dolibarr/dolibarr/commit/7f021ad5d9d259e1f18494ebc3a92be201041b90
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

  Changed paths:
    M build/perl/virtualmin/dolibarr.pl
    A htdocs/expedition/tpl/linkedobjectblock.tpl.php
    M htdocs/langs/en_US/sendings.lang
    M htdocs/langs/fr_FR/sendings.lang

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: b0ab71db5f260d114ed0c3f60b1038db8f974051
      
https://github.com/Dolibarr/dolibarr/commit/b0ab71db5f260d114ed0c3f60b1038db8f974051
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-02 (Mon, 02 Jul 2012)

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

  Log Message:
  -----------
  Fix: merge problem


  Commit: ab6129a1cce9f9d4ce597b61daaa0a20a8ac3403
      
https://github.com/Dolibarr/dolibarr/commit/ab6129a1cce9f9d4ce597b61daaa0a20a8ac3403
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

  Changed paths:
    M htdocs/core/js/editinplace.js

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: bf9fd6a2dae922493d6c7e779e1b4cb6b2483ef8
      
https://github.com/Dolibarr/dolibarr/commit/bf9fd6a2dae922493d6c7e779e1b4cb6b2483ef8
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-03 (Tue, 03 Jul 2012)

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

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 8befcb9477a4246cf965cd56dcae7efe59f7b574
      
https://github.com/Dolibarr/dolibarr/commit/8befcb9477a4246cf965cd56dcae7efe59f7b574
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M htdocs/comm/index.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: ce7f45ab1f55a5cf603392a252c49d7f3d9b11a8
      
https://github.com/Dolibarr/dolibarr/commit/ce7f45ab1f55a5cf603392a252c49d7f3d9b11a8
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-05 (Thu, 05 Jul 2012)

  Changed paths:
    M htdocs/comm/index.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: ff048175f71f234e1e18248897c162e78112dbb7
      
https://github.com/Dolibarr/dolibarr/commit/ff048175f71f234e1e18248897c162e78112dbb7
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M htdocs/product/stats/propal.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 6f919da5d9f83b7950a46da79a1f2192aeafc273
      
https://github.com/Dolibarr/dolibarr/commit/6f919da5d9f83b7950a46da79a1f2192aeafc273
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: c8eb666826c028ca5abc89da1551327afea51b6f
      
https://github.com/Dolibarr/dolibarr/commit/c8eb666826c028ca5abc89da1551327afea51b6f
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M htdocs/admin/perms.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/user/fiche.php
    M htdocs/user/group/perms.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Fix: compatibility with multicompany


  Commit: 41dcd9370a1c7dfd6890c2410b6e28db6f61057f
      
https://github.com/Dolibarr/dolibarr/commit/41dcd9370a1c7dfd6890c2410b6e28db6f61057f
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-06 (Fri, 06 Jul 2012)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 8ee06f02b1f799403b2046a6f10a4b165d0516e8
      
https://github.com/Dolibarr/dolibarr/commit/8ee06f02b1f799403b2046a6f10a4b165d0516e8
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

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

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 250e3555c3cc8d6433c419bd25a8217556f46a78
      
https://github.com/Dolibarr/dolibarr/commit/250e3555c3cc8d6433c419bd25a8217556f46a78
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

  Changed paths:
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/main.inc.php
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php
    M htdocs/user/group/fiche.php

  Log Message:
  -----------
  Fix: more bugs with multicompany


  Commit: 293e0ac83126f2ad1a9164520ba809b88ab851c1
      
https://github.com/Dolibarr/dolibarr/commit/293e0ac83126f2ad1a9164520ba809b88ab851c1
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

  Changed paths:
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/login/functions_dolibarr.php
    M htdocs/user/class/user.class.php

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

Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2


  Commit: 925bded6d949d803cff602c5f109872b441ec1a6
      
https://github.com/Dolibarr/dolibarr/commit/925bded6d949d803cff602c5f109872b441ec1a6
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

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

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 8b832f475fbd00fc2ea36b70658073841ea904ee
      
https://github.com/Dolibarr/dolibarr/commit/8b832f475fbd00fc2ea36b70658073841ea904ee
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

  Changed paths:
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: getpost error


  Commit: 3686fad393caa402faa6e96e7dc022b925a8f59d
      
https://github.com/Dolibarr/dolibarr/commit/3686fad393caa402faa6e96e7dc022b925a8f59d
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-07 (Sat, 07 Jul 2012)

  Changed paths:
    M htdocs/user/class/usergroup.class.php
    M htdocs/user/fiche.php
    M htdocs/user/group/fiche.php
    M htdocs/user/group/index.php

  Log Message:
  -----------
  Fix: compatibility with multicompany and transverse mode


  Commit: 2f9f7d401f816a4b316d7eec320a781eb858b161
      
https://github.com/Dolibarr/dolibarr/commit/2f9f7d401f816a4b316d7eec320a781eb858b161
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-08 (Sun, 08 Jul 2012)

  Changed paths:
    M build/exe/doliwamp/doliwamp.iss

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://github.com/Dolibarr/dolibarr into 3.2.1


  Commit: 02f30aeee2a4337000274627c8fde47032701d5b
      
https://github.com/Dolibarr/dolibarr/commit/02f30aeee2a4337000274627c8fde47032701d5b
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M htdocs/filefunc.inc.php

  Log Message:
  -----------
  Merge branch '3.2' of git+ssh://address@hidden/Dolibarr/dolibarr.git into 
3.2.1


  Commit: 1af4834f1016bdf58382c3f9e7820982b7a1ace4
      
https://github.com/Dolibarr/dolibarr/commit/1af4834f1016bdf58382c3f9e7820982b7a1ace4
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M htdocs/user/fiche.php
    M htdocs/user/group/fiche.php

  Log Message:
  -----------
  Fix: for multicompany transverse mode


  Commit: 20704d6a5cfccab551215123fc19a2a47686f4a3
      
https://github.com/Dolibarr/dolibarr/commit/20704d6a5cfccab551215123fc19a2a47686f4a3
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/admin/workflow.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/fr_FR/workflow.lang

  Log Message:
  -----------
  New: classify billed order if invoice billed (workflow
manager)

Conflicts:
        htdocs/core/class/commonobject.class.php
        htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
        htdocs/langs/en_US/workflow.lang
        htdocs/langs/fr_FR/workflow.lang


  Commit: b801a391a430b0bf0ff773a96a275e39d3a77e20
      
https://github.com/Dolibarr/dolibarr/commit/b801a391a430b0bf0ff773a96a275e39d3a77e20
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/webservices/server_thirdparty.php

  Log Message:
  -----------
  Fix: Phone not saved when using web service


  Commit: 9327858bee465fc2ff55f4235f912ad0be2aa93f
      
https://github.com/Dolibarr/dolibarr/commit/9327858bee465fc2ff55f4235f912ad0be2aa93f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/core/class/commonobject.class.php

  Log Message:
  -----------
  Fix: Bad merge


  Commit: 10e632375f7940a6edc120f15614eeb61d57d626
      
https://github.com/Dolibarr/dolibarr/commit/10e632375f7940a6edc120f15614eeb61d57d626
  Author: simnandez <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

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

  Log Message:
  -----------
  Fix: Bad local taxes if price base type is TTC


  Commit: 80147137957782fac75f4d4d919d21ae4782aeb0
      
https://github.com/Dolibarr/dolibarr/commit/80147137957782fac75f4d4d919d21ae4782aeb0
  Author: simnandez <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

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

  Log Message:
  -----------
  Fix: Bad local taxes if price base type is TTC


  Commit: fd9574a2f8ca6ffc559a498d0e5f9c70b1083109
      
https://github.com/Dolibarr/dolibarr/commit/fd9574a2f8ca6ffc559a498d0e5f9c70b1083109
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

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

  Log Message:
  -----------
  Merge pull request #241 from simnandez/3.2

3.2


  Commit: a83c118a8ffe797b7f73196dc71508a9bb65cfe3
      
https://github.com/Dolibarr/dolibarr/commit/a83c118a8ffe797b7f73196dc71508a9bb65cfe3
  Author: simnandez <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Trad: Add missing translations


  Commit: 7e25172f03071ed4260ea957d4acb72d700235f5
      
https://github.com/Dolibarr/dolibarr/commit/7e25172f03071ed4260ea957d4acb72d700235f5
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/index.php
    M htdocs/fourn/facture/paiement.php

  Log Message:
  -----------
  Fix: missing entity filter


  Commit: dd7c3ed2f8d0be9b7bd319488d7659bb40587e4a
      
https://github.com/Dolibarr/dolibarr/commit/dd7c3ed2f8d0be9b7bd319488d7659bb40587e4a
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Merge pull request #243 from simnandez/3.2

Trad: Add missing translations


  Commit: af9b03e7c73d9b1927582998b0b43418da346d48
      
https://github.com/Dolibarr/dolibarr/commit/af9b03e7c73d9b1927582998b0b43418da346d48
  Author: simnandez <address@hidden>
  Date:   2012-07-14 (Sat, 14 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/es_ES/companies.lang

  Log Message:
  -----------
  Trad: Add missing translation


  Commit: 53cc1667d59b204197d2b71d5e41ce05c28106c1
      
https://github.com/Dolibarr/dolibarr/commit/53cc1667d59b204197d2b71d5e41ce05c28106c1
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

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

  Log Message:
  -----------
  Fix: error when validating shipment for non predefined products with a
selected warehouse.


  Commit: b73014c0449a8512f162814b3ee8213ae0bffce2
      
https://github.com/Dolibarr/dolibarr/commit/b73014c0449a8512f162814b3ee8213ae0bffce2
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M htdocs/core/lib/price.lib.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/index.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/langs/ca_ES/sendings.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/sendings.lang
    M htdocs/langs/es_ES/workflow.lang

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


  Commit: f4f2db33f014669edd2df550d4f65b308e9076af
      
https://github.com/Dolibarr/dolibarr/commit/f4f2db33f014669edd2df550d4f65b308e9076af
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M htdocs/langs/en_US/orders.lang
    M htdocs/langs/en_US/workflow.lang
    M htdocs/langs/fr_FR/orders.lang
    M htdocs/langs/fr_FR/workflow.lang

  Log Message:
  -----------
  Better translation

Conflicts:
        htdocs/langs/en_US/workflow.lang
        htdocs/langs/fr_FR/workflow.lang


  Commit: 4f2a47c4fc6c1b03f033188b980a237ebefaf45a
      
https://github.com/Dolibarr/dolibarr/commit/4f2a47c4fc6c1b03f033188b980a237ebefaf45a
  Author: Marcos García <address@hidden>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  Fixed bug 
https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144


  Commit: 29256aba8b5e30b93e77dac9e628c0e5d43cea95
      
https://github.com/Dolibarr/dolibarr/commit/29256aba8b5e30b93e77dac9e628c0e5d43cea95
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M htdocs/contrat/fiche.php

  Log Message:
  -----------
  Merge pull request #245 from marcosgdf/fix-bug-456

Fixed bug #465


  Commit: 45b24fff0d9ab2537ad15721a372bd9f36583c9e
      
https://github.com/Dolibarr/dolibarr/commit/45b24fff0d9ab2537ad15721a372bd9f36583c9e
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/es_ES/companies.lang

  Log Message:
  -----------
  Merge pull request #244 from simnandez/3.2

Trad: Add missing translation


  Commit: 5a1e29cc0814eabb14d0bbfe2aea3760c95da9ac
      
https://github.com/Dolibarr/dolibarr/commit/5a1e29cc0814eabb14d0bbfe2aea3760c95da9ac
  Author: simnandez <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Trad: Better translation


  Commit: d68a2cb0d8a0ae67311c8d52c4002cbcd4317754
      
https://github.com/Dolibarr/dolibarr/commit/d68a2cb0d8a0ae67311c8d52c4002cbcd4317754
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/core/class/conf.class.php

  Log Message:
  -----------
  Fix: Removed warning


  Commit: 03f85bef83746ea9c9a30fd59c7e800275ca9023
      
https://github.com/Dolibarr/dolibarr/commit/03f85bef83746ea9c9a30fd59c7e800275ca9023
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [ bug #444 ] Regression on auto-closing for proposals and orders


  Commit: d1646e245a0dcbc12c7f8404618bde7e2cb26e4b
      
https://github.com/Dolibarr/dolibarr/commit/d1646e245a0dcbc12c7f8404618bde7e2cb26e4b
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/contrat/document.php

  Log Message:
  -----------
  The tab Documents of the Contracts module wasn't being translated


  Commit: 674aa0cf12fbbd977e6538d8c69b258f5623500b
      
https://github.com/Dolibarr/dolibarr/commit/674aa0cf12fbbd977e6538d8c69b258f5623500b
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  Fix: Duplicate begin


  Commit: f5a4f32b0f494e38808bd2b79d434979794723c9
      
https://github.com/Dolibarr/dolibarr/commit/f5a4f32b0f494e38808bd2b79d434979794723c9
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [ bug #445 ] Hex escaping in descriptions


  Commit: 9b21aa0a60ac3a35fb216f11ce802981a2e5686b
      
https://github.com/Dolibarr/dolibarr/commit/9b21aa0a60ac3a35fb216f11ce802981a2e5686b
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/admin/proxy.php
    M htdocs/admin/security_other.php

  Log Message:
  -----------
  Replaced "Seconds" for "seconds"


  Commit: e7d117c9203ea31c0db5bc3a0def5a8339cec398
      
https://github.com/Dolibarr/dolibarr/commit/e7d117c9203ea31c0db5bc3a0def5a8339cec398
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/banks.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/users.lang

  Log Message:
  -----------
  Fixed some spanish & catalan translations


  Commit: d5c95b76a506730fb4b1146c04ac8db4c025231e
      
https://github.com/Dolibarr/dolibarr/commit/d5c95b76a506730fb4b1146c04ac8db4c025231e
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/companies.lang

  Log Message:
  -----------
  Added missing translation and fixed some typos


  Commit: 7ad2de61d1e41c7d7ed9114b66b99937d35709e3
      
https://github.com/Dolibarr/dolibarr/commit/7ad2de61d1e41c7d7ed9114b66b99937d35709e3
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/admin/proxy.php
    M htdocs/admin/security_other.php

  Log Message:
  -----------
  Merge pull request #249 from marcosgdf/fix-security-seconds-translation

Replaced "Seconds" for "seconds"


  Commit: 4fcbe39fd94ed1d920d91a0e3fa727ee0860938e
      
https://github.com/Dolibarr/dolibarr/commit/4fcbe39fd94ed1d920d91a0e3fa727ee0860938e
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/contrat/document.php

  Log Message:
  -----------
  Merge pull request #248 from marcosgdf/fix-contract-translation

The tab Documents of the Contracts module wasn't being translated


  Commit: 467bf090dd07354eca10fd4790a84607f6aab2da
      
https://github.com/Dolibarr/dolibarr/commit/467bf090dd07354eca10fd4790a84607f6aab2da
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/workflow.lang

  Log Message:
  -----------
  Merge pull request #246 from simnandez/3.2

Trad: Better translation


  Commit: 78b0f14b1aff59747aec6d915179d4c315a6a6e3
      
https://github.com/Dolibarr/dolibarr/commit/78b0f14b1aff59747aec6d915179d4c315a6a6e3
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  Text: Chiffrer


  Commit: 5386f00b0e9043f53d2516e99e689414e739c4dd
      
https://github.com/Dolibarr/dolibarr/commit/5386f00b0e9043f53d2516e99e689414e739c4dd
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/admin/proxy.php
    M htdocs/admin/security_other.php
    M htdocs/commande/class/commande.class.php
    M htdocs/contrat/document.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/langs/ca_ES/orders.lang
    M htdocs/langs/ca_ES/workflow.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/workflow.lang
    M htdocs/product/class/product.class.php

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


  Commit: 0b2e07964f416f287b8b5cd396630405b0a3a31c
      
https://github.com/Dolibarr/dolibarr/commit/0b2e07964f416f287b8b5cd396630405b0a3a31c
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/boutique/index.php
    M htdocs/langs/fr_FR/boxes.lang
    M htdocs/langs/fr_FR/commercial.lang
    M htdocs/langs/fr_FR/compta.lang

  Log Message:
  -----------
  French spelling
Chiffre d'affaire -> Chiffre d'affaires


  Commit: 2160e869282ee2f01628edf4554867e6b2cc6346
      
https://github.com/Dolibarr/dolibarr/commit/2160e869282ee2f01628edf4554867e6b2cc6346
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  French wording
Réception -> Traitement en cours


  Commit: 50129ec945d3ccbea873a8c6348849186a1f8cd5
      
https://github.com/Dolibarr/dolibarr/commit/50129ec945d3ccbea873a8c6348849186a1f8cd5
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/core/boxes/box_contracts.php

  Log Message:
  -----------
  Contracts box name wasn't being translated


  Commit: af9c8abe9c48c0a6dd3d2e4e8633a59e00c4b72e
      
https://github.com/Dolibarr/dolibarr/commit/af9c8abe9c48c0a6dd3d2e4e8633a59e00c4b72e
  Author: Marcos García <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/banks.lang
    M htdocs/langs/ca_ES/companies.lang
    M htdocs/langs/ca_ES/contracts.lang

  Log Message:
  -----------
  Fixed Catalan typos too


  Commit: 34f790b85e2696eb210e752097197e018386a05a
      
https://github.com/Dolibarr/dolibarr/commit/34f790b85e2696eb210e752097197e018386a05a
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M htdocs/core/boxes/box_contracts.php
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/ca_ES/banks.lang
    M htdocs/langs/ca_ES/contracts.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/banks.lang
    M htdocs/langs/es_ES/contracts.lang
    M htdocs/langs/es_ES/users.lang

  Log Message:
  -----------
  Merge pull request #250 from marcosgdf/fix-some-translations

Fix some typos on translations


  Commit: 0ff5a7bc9c551c9af28e7898d943c5870b5ff432
      
https://github.com/Dolibarr/dolibarr/commit/0ff5a7bc9c551c9af28e7898d943c5870b5ff432
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang

  Log Message:
  -----------
  Fixed little typo


  Commit: 5f0491bc6fc7098b805a4dbc94ef2f25bfc4fd73
      
https://github.com/Dolibarr/dolibarr/commit/5f0491bc6fc7098b805a4dbc94ef2f25bfc4fd73
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/fichinter/fiche.php

  Log Message:
  -----------
  There's no disec input...


  Commit: 3ed1795096cd65c4f5fb8525c4d67b8b11dba326
      
https://github.com/Dolibarr/dolibarr/commit/3ed1795096cd65c4f5fb8525c4d67b8b11dba326
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/interventions.lang

  Log Message:
  -----------
  Added missing translation


  Commit: fa8fad3b0496617de0b5f46d01198c1bd1254fe5
      
https://github.com/Dolibarr/dolibarr/commit/fa8fad3b0496617de0b5f46d01198c1bd1254fe5
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/core/menus/standard/eldy.lib.php

  Log Message:
  -----------
  SMS should be upper-cased


  Commit: 11430cd5555bb18a662a1f9f882b4f5f85738f44
      
https://github.com/Dolibarr/dolibarr/commit/11430cd5555bb18a662a1f9f882b4f5f85738f44
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/admin/system/index.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/install.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/zh_CN/admin.lang

  Log Message:
  -----------
  Php should be upper-cased. Also removed the string from the lang files as it 
should not be translated. I even think that in China they call it PHP


  Commit: c3b18a1e385e358bbb9338d5d5f99e359d5da24f
      
https://github.com/Dolibarr/dolibarr/commit/c3b18a1e385e358bbb9338d5d5f99e359d5da24f
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/main.lang

  Log Message:
  -----------
  Spanish translation typo


  Commit: f6fc21f5fb724fd400d679e83e83cef66ea0f8d2
      
https://github.com/Dolibarr/dolibarr/commit/f6fc21f5fb724fd400d679e83e83cef66ea0f8d2
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/comm/propal/document.php

  Log Message:
  -----------
  Fixed a minor bug with the BackToList link in a budget detail view reported 
in Dolibarr.es
You'll see a lot of lines changed because of incorrect line endings


  Commit: c2f465a98a4cf8382ffdf597d59ed4f367158228
      
https://github.com/Dolibarr/dolibarr/commit/c2f465a98a4cf8382ffdf597d59ed4f367158228
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang

  Log Message:
  -----------
  Added some missing translations in es_ES and fixed a typo too


  Commit: c0c481a746be661affa7d1ffe554ee950a791f33
      
https://github.com/Dolibarr/dolibarr/commit/c0c481a746be661affa7d1ffe554ee950a791f33
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/orders.lang

  Log Message:
  -----------
  Translation Typo in es_ES


  Commit: ccdaf2ffb46be2634437c411e7c18e2570c5adc0
      
https://github.com/Dolibarr/dolibarr/commit/ccdaf2ffb46be2634437c411e7c18e2570c5adc0
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/products.lang
    M htdocs/product/fiche.php

  Log Message:
  -----------
  When viewing a product/service, if we don't know the type of the item, then 
we use a generic page title. Also fixed typo in es_ES


  Commit: 3d10d6a5595dd8c442f25a8850158143dc00a17f
      
https://github.com/Dolibarr/dolibarr/commit/3d10d6a5595dd8c442f25a8850158143dc00a17f
  Author: Marcos García <address@hidden>
  Date:   2012-07-20 (Fri, 20 Jul 2012)

  Changed paths:
    M htdocs/product/index.php

  Log Message:
  -----------
  It was showing Products Area instead of Products and Services Area


  Commit: 49d943e57f917d225c6ae6ff0fe0da88cae31841
      
https://github.com/Dolibarr/dolibarr/commit/49d943e57f917d225c6ae6ff0fe0da88cae31841
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/admin/ihm.php
    M htdocs/commande/fiche.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/product/fiche.php
    M htdocs/product/traduction.php

  Log Message:
  -----------
  Removed duplicated code


  Commit: ee0f92f6aabf402f0facac7c9c67ae4eabef69d0
      
https://github.com/Dolibarr/dolibarr/commit/ee0f92f6aabf402f0facac7c9c67ae4eabef69d0
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/ecm.lang

  Log Message:
  -----------
  Add missing es_ES translations


  Commit: 06b6c38379da0c299682f1bc9bc642efa475fd8b
      
https://github.com/Dolibarr/dolibarr/commit/06b6c38379da0c299682f1bc9bc642efa475fd8b
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/products.lang

  Log Message:
  -----------
  There's no "Código de barra"


  Commit: c5e1b367de554de76ea73b457904656e56fc11c6
      
https://github.com/Dolibarr/dolibarr/commit/c5e1b367de554de76ea73b457904656e56fc11c6
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang

  Log Message:
  -----------
  Merge branch 'fix-spanish-translation-typo' into minor-fixes


  Commit: 4b62eaeed213077e7a0c772acd5cc48c6fb80cf2
      
https://github.com/Dolibarr/dolibarr/commit/4b62eaeed213077e7a0c772acd5cc48c6fb80cf2
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/ecm.lang
    M htdocs/langs/es_ES/main.lang

  Log Message:
  -----------
  Typos in es_ES and added missing translations


  Commit: 8bc3608717bc8215b770f03b7fafb08de63e30e2
      
https://github.com/Dolibarr/dolibarr/commit/8bc3608717bc8215b770f03b7fafb08de63e30e2
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/adherents/admin/mailman.php
    M htdocs/core/lib/mailmanspip.lib.php
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/tr_TR/admin.lang

  Log Message:
  -----------
  Allowed MailmanTitle to be translated, also SPIP should be upper-cased


  Commit: 10384e385681049fd8ad6b5d11997e8a461bae31
      
https://github.com/Dolibarr/dolibarr/commit/10384e385681049fd8ad6b5d11997e8a461bae31
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/admin.lang

  Log Message:
  -----------
  Another mini typo


  Commit: 7f243d92e5f455fbc118577f832c7ede6b9c4e3a
      
https://github.com/Dolibarr/dolibarr/commit/7f243d92e5f455fbc118577f832c7ede6b9c4e3a
  Author: Marcos García <address@hidden>
  Date:   2012-07-21 (Sat, 21 Jul 2012)

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

  Log Message:
  -----------
  Removed unnecesary code


  Commit: f1f9c842f83532ef28e71ac5151f46d983f11a2d
      
https://github.com/Dolibarr/dolibarr/commit/f1f9c842f83532ef28e71ac5151f46d983f11a2d
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/admin/workflow.php

  Log Message:
  -----------
  Fix: The missing feature to close proposal on order close was fixed
differently.


  Commit: 2a9456cb834bc12986773b239f7a1e660244e88c
      
https://github.com/Dolibarr/dolibarr/commit/2a9456cb834bc12986773b239f7a1e660244e88c
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_BR/banks.lang
    M htdocs/langs/pt_BR/bills.lang
    M htdocs/langs/pt_BR/categories.lang
    M htdocs/langs/pt_BR/commercial.lang
    M htdocs/langs/pt_BR/companies.lang
    M htdocs/langs/pt_BR/contracts.lang
    M htdocs/langs/pt_BR/deliveries.lang
    M htdocs/langs/pt_BR/dict.lang
    M htdocs/langs/pt_BR/ecm.lang
    M htdocs/langs/pt_BR/interventions.lang
    M htdocs/langs/pt_BR/mails.lang
    M htdocs/langs/pt_BR/main.lang
    M htdocs/langs/pt_BR/members.lang
    M htdocs/langs/pt_BR/orders.lang
    M htdocs/langs/pt_BR/projects.lang
    M htdocs/langs/pt_BR/propal.lang
    M htdocs/langs/pt_BR/sendings.lang
    M htdocs/langs/pt_BR/suppliers.lang
    M htdocs/langs/pt_BR/trips.lang
    M htdocs/langs/pt_BR/users.lang
    M htdocs/langs/pt_BR/withdrawals.lang

  Log Message:
  -----------
  Fix: Brazilian translation


  Commit: 1eae596f98abf9c5ef5dd4e6dfd3af4bcaf3f2c5
      
https://github.com/Dolibarr/dolibarr/commit/1eae596f98abf9c5ef5dd4e6dfd3af4bcaf3f2c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M ChangeLog
    M build/exe/doliwamp/doliwamp.iss
    M build/makepack-dolibarr.pl
    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 htdocs/filefunc.inc.php
    M htdocs/install/inc.php
    M htdocs/support/inc.php

  Log Message:
  -----------
  Prepare 3.2.1


  Commit: 148e40e07ca2f88f34efb8926ce235923b880de9
      
https://github.com/Dolibarr/dolibarr/commit/148e40e07ca2f88f34efb8926ce235923b880de9
  Author: Marcos García <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/langs/ar_SA/bookmarks.lang
    M htdocs/langs/ar_SA/other.lang
    M htdocs/langs/ca_ES/bookmarks.lang
    M htdocs/langs/ca_ES/other.lang
    M htdocs/langs/da_DK/bookmarks.lang
    M htdocs/langs/da_DK/other.lang
    M htdocs/langs/de_AT/bookmarks.lang
    M htdocs/langs/de_AT/other.lang
    M htdocs/langs/de_DE/bookmarks.lang
    M htdocs/langs/de_DE/other.lang
    M htdocs/langs/el_GR/bookmarks.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/en_US/bookmarks.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/es_ES/bookmarks.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/et_EE/bookmarks.lang
    M htdocs/langs/et_EE/other.lang
    M htdocs/langs/fa_IR/bookmarks.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fi_FI/bookmarks.lang
    M htdocs/langs/fi_FI/other.lang
    M htdocs/langs/fr_FR/bookmarks.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/he_IL/bookmarks.lang
    M htdocs/langs/he_IL/other.lang
    M htdocs/langs/hu_HU/bookmarks.lang
    M htdocs/langs/hu_HU/other.lang
    M htdocs/langs/is_IS/bookmarks.lang
    M htdocs/langs/is_IS/other.lang
    M htdocs/langs/it_IT/bookmarks.lang
    M htdocs/langs/it_IT/other.lang
    M htdocs/langs/ja_JP/bookmarks.lang
    M htdocs/langs/ja_JP/other.lang
    M htdocs/langs/nb_NO/bookmarks.lang
    M htdocs/langs/nb_NO/other.lang
    M htdocs/langs/nl_BE/bookmarks.lang
    M htdocs/langs/nl_BE/other.lang
    M htdocs/langs/nl_NL/bookmarks.lang
    M htdocs/langs/nl_NL/other.lang
    M htdocs/langs/pl_PL/bookmarks.lang
    M htdocs/langs/pl_PL/other.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_PT/bookmarks.lang
    M htdocs/langs/pt_PT/other.lang
    M htdocs/langs/ro_RO/bookmarks.lang
    M htdocs/langs/ro_RO/other.lang
    M htdocs/langs/ru_RU/bookmarks.lang
    M htdocs/langs/ru_RU/other.lang
    M htdocs/langs/ru_UA/bookmarks.lang
    M htdocs/langs/ru_UA/other.lang
    M htdocs/langs/sl_SI/bookmarks.lang
    M htdocs/langs/sl_SI/other.lang
    M htdocs/langs/sv_SE/bookmarks.lang
    M htdocs/langs/sv_SE/other.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/zh_CN/bookmarks.lang
    M htdocs/langs/zh_CN/other.lang

  Log Message:
  -----------
  Moved bookmark translations from other.lang to bookmarks.lang, also removed 
unused translations


  Commit: 23c4f78df00f6af252b0b7e1631c1e3a672df908
      
https://github.com/Dolibarr/dolibarr/commit/23c4f78df00f6af252b0b7e1631c1e3a672df908
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/langs/ar_SA/bookmarks.lang
    M htdocs/langs/ar_SA/other.lang
    M htdocs/langs/ca_ES/bookmarks.lang
    M htdocs/langs/ca_ES/other.lang
    M htdocs/langs/da_DK/bookmarks.lang
    M htdocs/langs/da_DK/other.lang
    M htdocs/langs/de_AT/bookmarks.lang
    M htdocs/langs/de_AT/other.lang
    M htdocs/langs/de_DE/bookmarks.lang
    M htdocs/langs/de_DE/other.lang
    M htdocs/langs/el_GR/bookmarks.lang
    M htdocs/langs/el_GR/other.lang
    M htdocs/langs/en_US/bookmarks.lang
    M htdocs/langs/en_US/other.lang
    M htdocs/langs/es_ES/bookmarks.lang
    M htdocs/langs/es_ES/other.lang
    M htdocs/langs/et_EE/bookmarks.lang
    M htdocs/langs/et_EE/other.lang
    M htdocs/langs/fa_IR/bookmarks.lang
    M htdocs/langs/fa_IR/other.lang
    M htdocs/langs/fi_FI/bookmarks.lang
    M htdocs/langs/fi_FI/other.lang
    M htdocs/langs/fr_FR/bookmarks.lang
    M htdocs/langs/fr_FR/other.lang
    M htdocs/langs/he_IL/bookmarks.lang
    M htdocs/langs/he_IL/other.lang
    M htdocs/langs/hu_HU/bookmarks.lang
    M htdocs/langs/hu_HU/other.lang
    M htdocs/langs/is_IS/bookmarks.lang
    M htdocs/langs/is_IS/other.lang
    M htdocs/langs/it_IT/bookmarks.lang
    M htdocs/langs/it_IT/other.lang
    M htdocs/langs/ja_JP/bookmarks.lang
    M htdocs/langs/ja_JP/other.lang
    M htdocs/langs/nb_NO/bookmarks.lang
    M htdocs/langs/nb_NO/other.lang
    M htdocs/langs/nl_BE/bookmarks.lang
    M htdocs/langs/nl_BE/other.lang
    M htdocs/langs/nl_NL/bookmarks.lang
    M htdocs/langs/nl_NL/other.lang
    M htdocs/langs/pl_PL/bookmarks.lang
    M htdocs/langs/pl_PL/other.lang
    M htdocs/langs/pt_BR/bookmarks.lang
    M htdocs/langs/pt_BR/other.lang
    M htdocs/langs/pt_PT/bookmarks.lang
    M htdocs/langs/pt_PT/other.lang
    M htdocs/langs/ro_RO/bookmarks.lang
    M htdocs/langs/ro_RO/other.lang
    M htdocs/langs/ru_RU/bookmarks.lang
    M htdocs/langs/ru_RU/other.lang
    M htdocs/langs/ru_UA/bookmarks.lang
    M htdocs/langs/ru_UA/other.lang
    M htdocs/langs/sl_SI/bookmarks.lang
    M htdocs/langs/sl_SI/other.lang
    M htdocs/langs/sv_SE/bookmarks.lang
    M htdocs/langs/sv_SE/other.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/zh_CN/bookmarks.lang
    M htdocs/langs/zh_CN/other.lang

  Log Message:
  -----------
  Merge pull request #255 from marcosgdf/fix-bug-452

Fixed bug #452


  Commit: bcde526db18717d460642f49216d2e7f9e7d2722
      
https://github.com/Dolibarr/dolibarr/commit/bcde526db18717d460642f49216d2e7f9e7d2722
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: sql injection for create database


  Commit: 8074022e8f4659fad36ca7eb160c0c1fdeca954f
      
https://github.com/Dolibarr/dolibarr/commit/8074022e8f4659fad36ca7eb160c0c1fdeca954f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: dol_syslog at wrong place.


  Commit: a8d32b71bf09dc9372c1c7d15807d8b3457a20a4
      
https://github.com/Dolibarr/dolibarr/commit/a8d32b71bf09dc9372c1c7d15807d8b3457a20a4
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/adherents/admin/mailman.php
    M htdocs/admin/ihm.php
    M htdocs/admin/system/index.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/fiche.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/lib/mailmanspip.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/interventions.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/install.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/traduction.php

  Log Message:
  -----------
  Merge pull request #254 from marcosgdf/minor-fixes

Minor fixes


  Commit: 3efa77a70f1ef5262e2bbd701e44952617d3eff1
      
https://github.com/Dolibarr/dolibarr/commit/3efa77a70f1ef5262e2bbd701e44952617d3eff1
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/adherents/admin/mailman.php
    M htdocs/admin/ihm.php
    M htdocs/admin/system/index.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/fiche.php
    M htdocs/compta/deplacement/fiche.php
    M htdocs/core/lib/mailmanspip.lib.php
    M htdocs/core/lib/price.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/fichinter/fiche.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/langs/ar_SA/admin.lang
    M htdocs/langs/ca_ES/admin.lang
    M htdocs/langs/da_DK/admin.lang
    M htdocs/langs/de_AT/admin.lang
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/el_GR/admin.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/es_ES/admin.lang
    M htdocs/langs/es_ES/companies.lang
    M htdocs/langs/es_ES/errors.lang
    M htdocs/langs/es_ES/interventions.lang
    M htdocs/langs/es_ES/main.lang
    M htdocs/langs/es_ES/orders.lang
    M htdocs/langs/es_ES/products.lang
    M htdocs/langs/et_EE/admin.lang
    M htdocs/langs/fa_IR/admin.lang
    M htdocs/langs/fi_FI/admin.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/he_IL/admin.lang
    M htdocs/langs/hu_HU/admin.lang
    M htdocs/langs/is_IS/admin.lang
    M htdocs/langs/it_IT/admin.lang
    M htdocs/langs/ja_JP/admin.lang
    M htdocs/langs/nb_NO/admin.lang
    M htdocs/langs/nl_BE/admin.lang
    M htdocs/langs/nl_NL/admin.lang
    M htdocs/langs/pl_PL/admin.lang
    M htdocs/langs/pt_BR/admin.lang
    M htdocs/langs/pt_PT/admin.lang
    M htdocs/langs/ro_RO/admin.lang
    M htdocs/langs/ro_RO/install.lang
    M htdocs/langs/ru_RU/admin.lang
    M htdocs/langs/sl_SI/admin.lang
    M htdocs/langs/sv_SE/admin.lang
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/zh_CN/admin.lang
    M htdocs/product/fiche.php
    M htdocs/product/index.php
    M htdocs/product/traduction.php

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


  Commit: dc532cc2d4e8d2b2301924180a886a161b834867
      
https://github.com/Dolibarr/dolibarr/commit/dc532cc2d4e8d2b2301924180a886a161b834867
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: escape for create command


  Commit: b4aa076a82f2465c1c6dc69f918274d4930f6510
      
https://github.com/Dolibarr/dolibarr/commit/b4aa076a82f2465c1c6dc69f918274d4930f6510
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

  Changed paths:
    M htdocs/core/db/mysql.class.php
    M htdocs/core/db/mysqli.class.php

  Log Message:
  -----------
  Fix: escape for create command


  Commit: 0b77cb3a5dbfe39b2587e8310d99a9ab835def89
      
https://github.com/Dolibarr/dolibarr/commit/0b77cb3a5dbfe39b2587e8310d99a9ab835def89
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-22 (Sun, 22 Jul 2012)

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

  Log Message:
  -----------
  Fix: Translation missing


  Commit: a4ec4224b017469f453b4453f6a548f38eeb8f89
      
https://github.com/Dolibarr/dolibarr/commit/a4ec4224b017469f453b4453f6a548f38eeb8f89
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M htdocs/core/db/pgsql.class.php

  Log Message:
  -----------
  Fix: bug #467


  Commit: ab71e4f891a74738b4e6fb6ea4837cf399414ae3
      
https://github.com/Dolibarr/dolibarr/commit/ab71e4f891a74738b4e6fb6ea4837cf399414ae3
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M htdocs/core/db/pgsql.class.php

  Log Message:
  -----------
  Better fix


  Commit: 3e2e3b2bcb20ecbd1218e17a14da2d4a8c71879e
      
https://github.com/Dolibarr/dolibarr/commit/3e2e3b2bcb20ecbd1218e17a14da2d4a8c71879e
  Author: FHenry <address@hidden>
  Date:   2012-07-23 (Mon, 23 Jul 2012)

  Changed paths:
    M htdocs/comm/mailing/fiche.php

  Log Message:
  -----------
  Correction mail unsubcribe translation


  Commit: bc9d85b03f8782e781274b51f3ea2a56701ffc38
      
https://github.com/Dolibarr/dolibarr/commit/bc9d85b03f8782e781274b51f3ea2a56701ffc38
  Author: FHenry <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M htdocs/comm/mailing/fiche.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Unsubscribe tag spelling correction


  Commit: ba9861f8565135cd3177fab91a60162d7054490e
      
https://github.com/Dolibarr/dolibarr/commit/ba9861f8565135cd3177fab91a60162d7054490e
  Author: FHenry <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Add __MAILTOEMAIL__ to mailing-send.php


  Commit: 1891e7364af2d54f76faad5ea6b4193dc9da4b3f
      
https://github.com/Dolibarr/dolibarr/commit/1891e7364af2d54f76faad5ea6b4193dc9da4b3f
  Author: FHenry <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

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

  Log Message:
  -----------
  Fix nb mass mailling receive according other status than read


  Commit: 8a2e5b59622bfb7dabebb3b86cd1606cfb7d311d
      
https://github.com/Dolibarr/dolibarr/commit/8a2e5b59622bfb7dabebb3b86cd1606cfb7d311d
  Author: FHenry <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

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

  Log Message:
  -----------
  Fix style


  Commit: 58e61781e181a80c9f9e3d6182113ce32ed819fc
      
https://github.com/Dolibarr/dolibarr/commit/58e61781e181a80c9f9e3d6182113ce32ed819fc
  Author: FHenry <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M htdocs/admin/company.php

  Log Message:
  -----------
  Remove useless paramater


  Commit: 67fd6356aaf9b858874552e660f016428b31a27a
      
https://github.com/Dolibarr/dolibarr/commit/67fd6356aaf9b858874552e660f016428b31a27a
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M htdocs/admin/company.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/contact/class/contact.class.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Merge pull request #257 from FHenry/3.2

Correction mail unsubcribe translation


  Commit: 70cf8227a2c879b91c0ecdfd17302031bb6cff83
      
https://github.com/Dolibarr/dolibarr/commit/70cf8227a2c879b91c0ecdfd17302031bb6cff83
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

  Log Message:
  -----------
  Fix: Products with no prices not visible

Conflicts:
        htdocs/core/class/html.form.class.php


  Commit: a0f78aad4aed9d27080aa1a1f4ff19af8087721f
      
https://github.com/Dolibarr/dolibarr/commit/a0f78aad4aed9d27080aa1a1f4ff19af8087721f
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

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

  Log Message:
  -----------
  Fix: for compatibility


  Commit: 1b5f540d93026ee4b6a2a7cc83c6e8b3c19ff3b2
      
https://github.com/Dolibarr/dolibarr/commit/1b5f540d93026ee4b6a2a7cc83c6e8b3c19ff3b2
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/admin/perms.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/user/group/perms.php
    M htdocs/user/perms.php

  Log Message:
  -----------
  Fix: can't read permissions with an external module in root directory
instead "custom" directory


  Commit: 087644a8613d3ad930a56adcd34daba59dd8a38a
      
https://github.com/Dolibarr/dolibarr/commit/087644a8613d3ad930a56adcd34daba59dd8a38a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang

  Log Message:
  -----------
  Update translation for tr_TR

Conflicts:
        htdocs/langs/tr_TR/admin.lang
        htdocs/langs/tr_TR/agenda.lang
        htdocs/langs/tr_TR/bills.lang
        htdocs/langs/tr_TR/bookmarks.lang
        htdocs/langs/tr_TR/boxes.lang
        htdocs/langs/tr_TR/cashdesk.lang
        htdocs/langs/tr_TR/categories.lang
        htdocs/langs/tr_TR/commercial.lang
        htdocs/langs/tr_TR/companies.lang
        htdocs/langs/tr_TR/compta.lang
        htdocs/langs/tr_TR/dict.lang
        htdocs/langs/tr_TR/install.lang
        htdocs/langs/tr_TR/main.lang
        htdocs/langs/tr_TR/propal.lang
        htdocs/langs/tr_TR/sendings.lang


  Commit: 5c93da8a720ca30a31ab9a6f6d99ef841eccf95f
      
https://github.com/Dolibarr/dolibarr/commit/5c93da8a720ca30a31ab9a6f6d99ef841eccf95f
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M htdocs/projet/tasks.php

  Log Message:
  -----------
  Fix: problem with double quote


  Commit: 46304c8d982d8ece2307b10f725608ead3bdd55e
      
https://github.com/Dolibarr/dolibarr/commit/46304c8d982d8ece2307b10f725608ead3bdd55e
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M htdocs/langs/tr_TR/admin.lang
    M htdocs/langs/tr_TR/agenda.lang
    M htdocs/langs/tr_TR/banks.lang
    M htdocs/langs/tr_TR/bills.lang
    M htdocs/langs/tr_TR/bookmarks.lang
    M htdocs/langs/tr_TR/boxes.lang
    M htdocs/langs/tr_TR/cashdesk.lang
    M htdocs/langs/tr_TR/categories.lang
    M htdocs/langs/tr_TR/commercial.lang
    M htdocs/langs/tr_TR/companies.lang
    M htdocs/langs/tr_TR/compta.lang
    M htdocs/langs/tr_TR/contracts.lang
    M htdocs/langs/tr_TR/deliveries.lang
    M htdocs/langs/tr_TR/dict.lang
    M htdocs/langs/tr_TR/donations.lang
    M htdocs/langs/tr_TR/ecm.lang
    M htdocs/langs/tr_TR/errors.lang
    M htdocs/langs/tr_TR/exports.lang
    M htdocs/langs/tr_TR/externalsite.lang
    M htdocs/langs/tr_TR/ftp.lang
    M htdocs/langs/tr_TR/help.lang
    M htdocs/langs/tr_TR/install.lang
    M htdocs/langs/tr_TR/interventions.lang
    M htdocs/langs/tr_TR/languages.lang
    M htdocs/langs/tr_TR/ldap.lang
    M htdocs/langs/tr_TR/mails.lang
    M htdocs/langs/tr_TR/main.lang
    M htdocs/langs/tr_TR/members.lang
    M htdocs/langs/tr_TR/orders.lang
    M htdocs/langs/tr_TR/oscommerce.lang
    M htdocs/langs/tr_TR/other.lang
    M htdocs/langs/tr_TR/paybox.lang
    M htdocs/langs/tr_TR/paypal.lang
    M htdocs/langs/tr_TR/products.lang
    M htdocs/langs/tr_TR/projects.lang
    M htdocs/langs/tr_TR/propal.lang
    M htdocs/langs/tr_TR/sendings.lang
    M htdocs/langs/tr_TR/shop.lang
    M htdocs/langs/tr_TR/sms.lang
    M htdocs/langs/tr_TR/suppliers.lang
    M htdocs/langs/tr_TR/trips.lang
    M htdocs/langs/tr_TR/users.lang
    M htdocs/langs/tr_TR/withdrawals.lang
    M htdocs/langs/tr_TR/workflow.lang

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


  Commit: a92bb8373a66406bb6cc2d75ed27a527216154fb
      
https://github.com/Dolibarr/dolibarr/commit/a92bb8373a66406bb6cc2d75ed27a527216154fb
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

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

  Log Message:
  -----------
  Fix: bad path


  Commit: c55eabeaff0f30aea0ae7fee4761fab359b58a1a
      
https://github.com/Dolibarr/dolibarr/commit/c55eabeaff0f30aea0ae7fee4761fab359b58a1a
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M htdocs/comm/propal/stats/index.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/facture/stats/index.php

  Log Message:
  -----------
  Fix: external user confidentiality


  Commit: 51ccb33964f75cc32febee46d4a0dc76f4732cfc
      
https://github.com/Dolibarr/dolibarr/commit/51ccb33964f75cc32febee46d4a0dc76f4732cfc
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M htdocs/comm/address.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/contact.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/propal/note.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/contact.php
    M htdocs/commande/document.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/contact.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/note.php
    M htdocs/core/ajax/fileupload.php
    M htdocs/core/ajax/loadinplace.php
    M htdocs/core/ajax/saveinplace.php
    M htdocs/core/ajax/vatrates.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/conf.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/contract.lib.php
    M htdocs/core/lib/fichinter.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/fourn.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/invoice.lib.php
    M htdocs/core/lib/json.lib.php
    M htdocs/core/lib/order.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/propal.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/lib/security2.lib.php
    M htdocs/core/lib/sendings.lib.php
    M htdocs/core/modules/DolibarrModules.class.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/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/photos_resize.php
    M htdocs/core/tpl/contacts.tpl.php
    M htdocs/core/tpl/login.tpl.php
    M htdocs/core/triggers/interface_20_modPaypal_PaypalWorkflow.class.php

  Log Message:
  -----------
  Fix: carriage return


  Commit: c429c421da7e069ab51fd5f6ef62f0f6ec2f5125
      
https://github.com/Dolibarr/dolibarr/commit/c429c421da7e069ab51fd5f6ef62f0f6ec2f5125
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

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

  Log Message:
  -----------
  Fix: Bug #460 - Wrong entity assignment when creating a warehouse


  Commit: c92bd5827881f15741b8cff1e86a9a69eb57814a
      
https://github.com/Dolibarr/dolibarr/commit/c92bd5827881f15741b8cff1e86a9a69eb57814a
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: changelog


  Commit: 9798ddad8036ede0aa1e628ce1216bc9fa5ccf27
      
https://github.com/Dolibarr/dolibarr/commit/9798ddad8036ede0aa1e628ce1216bc9fa5ccf27
  Author: FHenry <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Correct bug 472


  Commit: 954f46ec6236910ec77641ee51ca8ea4922643d1
      
https://github.com/Dolibarr/dolibarr/commit/954f46ec6236910ec77641ee51ca8ea4922643d1
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

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

  Log Message:
  -----------
  Fix: Allows to use a comma decimal separator in supplier invoices
payments


  Commit: cbb5ca229a3ff75a29c023d6cf12fa70b053bf05
      
https://github.com/Dolibarr/dolibarr/commit/cbb5ca229a3ff75a29c023d6cf12fa70b053bf05
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Merge pull request #259 from FHenry/3.2

Correct bug 472


  Commit: a37035c862a7c443be1dbd7cfe95c393c8a980d9
      
https://github.com/Dolibarr/dolibarr/commit/a37035c862a7c443be1dbd7cfe95c393c8a980d9
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Fix: uniformize code


  Commit: 4ff5f1bf1c0c4b9f3bb32af179ae90284c07122d
      
https://github.com/Dolibarr/dolibarr/commit/4ff5f1bf1c0c4b9f3bb32af179ae90284c07122d
  Author: Marcos García <address@hidden>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Duplicated code


  Commit: 2a1c6422acc77a0dc2a1ed2e9e9662a7756b55bc
      
https://github.com/Dolibarr/dolibarr/commit/2a1c6422acc77a0dc2a1ed2e9e9662a7756b55bc
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Merge pull request #263 from marcosgdf/minor

Duplicated code


  Commit: c77ecc15c9bd91cb0edaed793b218d5ef6628bdc
      
https://github.com/Dolibarr/dolibarr/commit/c77ecc15c9bd91cb0edaed793b218d5ef6628bdc
  Author: Regis Houssin <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M htdocs/commande/fiche.php

  Log Message:
  -----------
  Fix: reorder include


  Commit: 498ac04ad107d36090434cc41d66319855d601a2
      
https://github.com/Dolibarr/dolibarr/commit/498ac04ad107d36090434cc41d66319855d601a2
  Author: Marcos García <address@hidden>
  Date:   2012-07-28 (Sat, 28 Jul 2012)

  Changed paths:
    M htdocs/langs/es_ES/products.lang

  Log Message:
  -----------
  Typo in es_ES translation


  Commit: 8a77ffe58f4f6a497adceb32c3655837a2ee595a
      
https://github.com/Dolibarr/dolibarr/commit/8a77ffe58f4f6a497adceb32c3655837a2ee595a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M htdocs/admin/mails.php
    M htdocs/comm/mailing/fiche.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/fileupload.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/class/notify.class.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/facture/doc/pdf_oursin.modules.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
    M htdocs/core/modules/societe/modules_societe.class.php
    M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
    M htdocs/install/lib/repair.lib.php
    M htdocs/product/fiche.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/class/task.class.php
    M htdocs/user/class/user.class.php
    M scripts/emailings/mailing-send.php

  Log Message:
  -----------
  Fix: Removing chekstyle warning helps me to find real bugs


  Commit: e15834dae26d98025f32de8e19bed26a734c0d45
      
https://github.com/Dolibarr/dolibarr/commit/e15834dae26d98025f32de8e19bed26a734c0d45
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-29 (Sun, 29 Jul 2012)

  Changed paths:
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php

  Log Message:
  -----------
  Fix: Removing chekstyle warning helps me to find real bugs


  Commit: ae6e3ad5c4a6483ec86db1f884e41763d3c196c5
      
https://github.com/Dolibarr/dolibarr/commit/ae6e3ad5c4a6483ec86db1f884e41763d3c196c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M htdocs/compta/paiement.php

  Log Message:
  -----------
  [ bug #464 ] Payment form should allow to add transmitter for bank transfers


  Commit: a2db2c5012a348170c3a5e6504c257e188a52c54
      
https://github.com/Dolibarr/dolibarr/commit/a2db2c5012a348170c3a5e6504c257e188a52c54
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Fix: regression (multicompany)


  Commit: f6afc75d9664c899f5df416eb38a3f576c6d8132
      
https://github.com/Dolibarr/dolibarr/commit/f6afc75d9664c899f5df416eb38a3f576c6d8132
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M htdocs/core/modules/modCommande.class.php
    M htdocs/core/modules/modFacture.class.php
    M htdocs/core/modules/modPropale.class.php
    M htdocs/core/modules/modSociete.class.php
    M htdocs/install/etape1.php

  Log Message:
  -----------
  Fix: avoid errors if install directory is deleted before module
activation


  Commit: ae0a74651099ba16c109855061e787a91a4e2df1
      
https://github.com/Dolibarr/dolibarr/commit/ae0a74651099ba16c109855061e787a91a4e2df1
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M htdocs/core/class/conf.class.php

  Log Message:
  -----------
  Fix: bad document path with multicompany


  Commit: 899f4df9ed92a284f857579ed27c805ad57e0d4b
      
https://github.com/Dolibarr/dolibarr/commit/899f4df9ed92a284f857579ed27c805ad57e0d4b
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M htdocs/compta/journal/purchasesjournal.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/product/admin/product.php

  Log Message:
  -----------
  Fix: [bug #478] Can access pages belonging to disabled modules


  Commit: 983c38a33dc151e468faf676ce2ee7beaa403780
      
https://github.com/Dolibarr/dolibarr/commit/983c38a33dc151e468faf676ce2ee7beaa403780
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M htdocs/langs/tr_TR/main.lang

  Log Message:
  -----------
  Fix: tr_TR


  Commit: a2641b89e7eb97e1ffac4d10ee3379bc93deb625
      
https://github.com/Dolibarr/dolibarr/commit/a2641b89e7eb97e1ffac4d10ee3379bc93deb625
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M htdocs/install/etape1.php

  Log Message:
  -----------
  Fix: Bad fix


  Commit: f4c9da5e9fb1203f8d7272be0f26b4bbc7a73154
      
https://github.com/Dolibarr/dolibarr/commit/f4c9da5e9fb1203f8d7272be0f26b4bbc7a73154
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Fix: Bad object


  Commit: 3778d206ac7c8dbceb365a6207ef793995554f53
      
https://github.com/Dolibarr/dolibarr/commit/3778d206ac7c8dbceb365a6207ef793995554f53
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M htdocs/projet/class/project.class.php
    M htdocs/projet/fiche.php

  Log Message:
  -----------
  Fix: project validation


  Commit: 6a4f03eab396e4b3d456c5a5cbd7851f3af15ae0
      
https://github.com/Dolibarr/dolibarr/commit/6a4f03eab396e4b3d456c5a5cbd7851f3af15ae0
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Prepare 3.2.1


  Commit: 17c45208d3a64d27b868b8c31d78cc835fe14de8
      
https://github.com/Dolibarr/dolibarr/commit/17c45208d3a64d27b868b8c31d78cc835fe14de8
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M build/debian/changelog
    R build/makepack-dolibarr.pl
    A build/makepack-dolibarr.pl
    A build/makepack-dolibarrmodule.pl
    R build/makepack-dolibarrmodule.pl
    R build/makepack-dolibarrtheme.pl
    A build/makepack-dolibarrtheme.pl

  Log Message:
  -----------
  Fix: Prepare 3.2.1 version


  Commit: e4f7df25b038f52ad7bf21e771f4d84b1ae82d74
      
https://github.com/Dolibarr/dolibarr/commit/e4f7df25b038f52ad7bf21e771f4d84b1ae82d74
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-04 (Sat, 04 Aug 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

  Log Message:
  -----------
  Fix: remove unused code for avoid warning with IE9


  Commit: be4960cfbb3ff3c3e75ddfffd8073a0999604f33
      
https://github.com/Dolibarr/dolibarr/commit/be4960cfbb3ff3c3e75ddfffd8073a0999604f33
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-04 (Sat, 04 Aug 2012)

  Changed paths:
    M htdocs/install/upgrade.php
    M htdocs/install/upgrade2.php

  Log Message:
  -----------
  Fix: exit code when upgrade is ran from command line


  Commit: fe672e1e4bb9d9cad1bbcd58f2c180e889c201a3
      
https://github.com/Dolibarr/dolibarr/commit/fe672e1e4bb9d9cad1bbcd58f2c180e889c201a3
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-04 (Sat, 04 Aug 2012)

  Changed paths:
    M htdocs/core/tpl/ajax/fileupload_main.tpl.php

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


  Commit: da29ea89a760b35c615eecf4597567aa8297f026
      
https://github.com/Dolibarr/dolibarr/commit/da29ea89a760b35c615eecf4597567aa8297f026
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

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

  Log Message:
  -----------
  Fix: avoid warning with php 5.4


  Commit: e1f57b60e3aadc1d9b7ba31eefe543d67df1c5f5
      
https://github.com/Dolibarr/dolibarr/commit/e1f57b60e3aadc1d9b7ba31eefe543d67df1c5f5
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/service/actions_card_service.class.php

  Log Message:
  -----------
  Qual: Removed bad herit


  Commit: fa4c69c52f2bfdc482dc8580af8cb5151c5f9c53
      
https://github.com/Dolibarr/dolibarr/commit/fa4c69c52f2bfdc482dc8580af8cb5151c5f9c53
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

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

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


  Commit: 54134e3d198e2225a89bd888f2b3e4457e9df284
      
https://github.com/Dolibarr/dolibarr/commit/54134e3d198e2225a89bd888f2b3e4457e9df284
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/core/class/fileupload.class.php

  Log Message:
  -----------
  Fix: compatibility with jquery fileupload


  Commit: da8bc79c6dd5a806a5632dc13ae26a3db2502f22
      
https://github.com/Dolibarr/dolibarr/commit/da8bc79c6dd5a806a5632dc13ae26a3db2502f22
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/canvas/service/actions_card_service.class.php
    M htdocs/user/class/user.class.php

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


  Commit: b1f3dbd45ede047a83ea075bc72e06ef1068356a
      
https://github.com/Dolibarr/dolibarr/commit/b1f3dbd45ede047a83ea075bc72e06ef1068356a
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

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

  Log Message:
  -----------
  Fix: indentation


  Commit: bb74a63d594cdc61d756c93e7f97ceeb1611a6a7
      
https://github.com/Dolibarr/dolibarr/commit/bb74a63d594cdc61d756c93e7f97ceeb1611a6a7
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/core/class/fileupload.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: delete pdf if supplier invoice is deleted
Fix: compatibility with external modules
(minimum for 3.2)


  Commit: bbe270d4bf26a4081961ec131f03e896f288e1c3
      
https://github.com/Dolibarr/dolibarr/commit/bbe270d4bf26a4081961ec131f03e896f288e1c3
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/core/lib/files.lib.php
    M htdocs/core/modules/expedition/modules_expedition.php
    M htdocs/core/modules/livraison/modules_livraison.php
    M htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/fiche.php
    M htdocs/livraison/class/livraison.class.php
    M htdocs/livraison/fiche.php

  Log Message:
  -----------
  Fix: missing delete shipping and delivery files
(minimum for possibility to merge with 3.2)

Conflicts:
        htdocs/core/modules/livraison/modules_livraison.php
        htdocs/livraison/class/livraison.class.php


  Commit: 96726c1c9b528c922a0ad21d3181ea424a75d848
      
https://github.com/Dolibarr/dolibarr/commit/96726c1c9b528c922a0ad21d3181ea424a75d848
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

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

  Log Message:
  -----------
  Fix: function setEventMessage() not in 3.2


  Commit: 8b2f1eee130a419a19a7f83d149891b11b09a6cd
      
https://github.com/Dolibarr/dolibarr/commit/8b2f1eee130a419a19a7f83d149891b11b09a6cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

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

  Log Message:
  -----------
  Fix: W3C


  Commit: 92624d650f80f029a562afc6456548a85a003ea8
      
https://github.com/Dolibarr/dolibarr/commit/92624d650f80f029a562afc6456548a85a003ea8
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M test/phpunit/CategorieTest.php

  Log Message:
  -----------
  Fix into categorie functions


  Commit: 4f5432160d8ad24083dfd8534b12be875edd0f04
      
https://github.com/Dolibarr/dolibarr/commit/4f5432160d8ad24083dfd8534b12be875edd0f04
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

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

  Log Message:
  -----------
  Fix: remove draft status if invoice is validated


  Commit: 117cd337dd0de1e66e5f06abb6815a3a84b18674
      
https://github.com/Dolibarr/dolibarr/commit/117cd337dd0de1e66e5f06abb6815a3a84b18674
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M htdocs/product/document.php

  Log Message:
  -----------
  Fix: missing object


  Commit: 99e234d703d925109b78632b4f84009cf2dd2334
      
https://github.com/Dolibarr/dolibarr/commit/99e234d703d925109b78632b4f84009cf2dd2334
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M htdocs/categories/class/categorie.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/impayees.php
    M test/phpunit/CategorieTest.php

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


  Commit: afeabd44f03496a4a8fb836ccefe484e256d488f
      
https://github.com/Dolibarr/dolibarr/commit/afeabd44f03496a4a8fb836ccefe484e256d488f
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload-ui.js
    M htdocs/includes/jquery/plugins/fileupload/js/jquery.fileupload.js

  Log Message:
  -----------
  Fix: update jquery fileupload


  Commit: 0a8ae2934dba71e3ea064b8ea8e79d5c5c5fbae1
      
https://github.com/Dolibarr/dolibarr/commit/0a8ae2934dba71e3ea064b8ea8e79d5c5c5fbae1
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    R htdocs/includes/jquery/plugins/fileupload/cors/result.html
    M htdocs/main.inc.php

  Log Message:
  -----------
  Fix: remove unused file and missing print


  Commit: 32a77474406720353044ccd4884c283806913124
      
https://github.com/Dolibarr/dolibarr/commit/32a77474406720353044ccd4884c283806913124
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/livraison/class/livraison.class.php

  Log Message:
  -----------
  Fix: Delete all files (PROV* when validating.


  Commit: 0f2a1a854bc7d23a3c52247854b5a4401ee24d83
      
https://github.com/Dolibarr/dolibarr/commit/0f2a1a854bc7d23a3c52247854b5a4401ee24d83
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

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

  Log Message:
  -----------
  Fix: autoselect when it should not


  Commit: 69b65de41bad3d5f59f3aab8cbdb5d306e8d1a08
      
https://github.com/Dolibarr/dolibarr/commit/69b65de41bad3d5f59f3aab8cbdb5d306e8d1a08
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

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

  Log Message:
  -----------
  Fix: Missing desc field


  Commit: 0db0ab34b437e5fcb9ea1a3d05b07156be0e8de2
      
https://github.com/Dolibarr/dolibarr/commit/0db0ab34b437e5fcb9ea1a3d05b07156be0e8de2
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M htdocs/fourn/commande/dispatch.php

  Log Message:
  -----------
  [ bug #480 ] Can't receive to stock with strict mode


  Commit: 4786ab926872a353edd4d405910cbdd7b330dd58
      
https://github.com/Dolibarr/dolibarr/commit/4786ab926872a353edd4d405910cbdd7b330dd58
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M htdocs/admin/fournisseur.php

  Log Message:
  -----------
  Fix: Specimen generation fails


  Commit: 7f7fa693f33e1da2e86d5693f4728ce0d7ca56f4
      
https://github.com/Dolibarr/dolibarr/commit/7f7fa693f33e1da2e86d5693f4728ce0d7ca56f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-07 (Tue, 07 Aug 2012)

  Changed paths:
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/commande/dispatch.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/livraison/class/livraison.class.php

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


  Commit: 34673e220d9370b7a4c2430e28af5dfadef870ea
      
https://github.com/Dolibarr/dolibarr/commit/34673e220d9370b7a4c2430e28af5dfadef870ea
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix: Display correct user in project tasks' time spent list

Use a local object rather than modifying the global $user object (sic!)


  Commit: db4240afadd1c035f625021fbd2ced5a0cd2019a
      
https://github.com/Dolibarr/dolibarr/commit/db4240afadd1c035f625021fbd2ced5a0cd2019a
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

  Changed paths:
    M htdocs/projet/tasks/time.php

  Log Message:
  -----------
  Fix: Do not overwrite global $user information


  Commit: d090788caac937d794ca3eddbcae4397dd858993
      
https://github.com/Dolibarr/dolibarr/commit/d090788caac937d794ca3eddbcae4397dd858993
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-08 (Wed, 08 Aug 2012)

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

  Log Message:
  -----------
  Fix: Do not run request if param is empty


  Commit: 3670cfd966ac692ecec1744913bdad92f05eb001
      
https://github.com/Dolibarr/dolibarr/commit/3670cfd966ac692ecec1744913bdad92f05eb001
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix: Broken feautres after migration from old versions


  Commit: 7e0b500d75e0f7c43e7915dd456cab14a590bde1
      
https://github.com/Dolibarr/dolibarr/commit/7e0b500d75e0f7c43e7915dd456cab14a590bde1
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc


  Commit: ff2dc246eb75e5f7319185c2f446f380a7a7f2eb
      
https://github.com/Dolibarr/dolibarr/commit/ff2dc246eb75e5f7319185c2f446f380a7a7f2eb
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-11 (Sat, 11 Aug 2012)

  Changed paths:
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml

  Log Message:
  -----------
  Update pad files


  Commit: 78a26d61ad80e45599f8fea70dd8afc31b503fe3
      
https://github.com/Dolibarr/dolibarr/commit/78a26d61ad80e45599f8fea70dd8afc31b503fe3
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/public/members/new.php

  Log Message:
  -----------
  Fixed bug #485
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144


  Commit: cb1e1be0d3714232fd44fc5caabc0949dd6d417f
      
https://github.com/Dolibarr/dolibarr/commit/cb1e1be0d3714232fd44fc5caabc0949dd6d417f
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog entry


  Commit: 7b671815e0cfa97ca03bd29fa30517820cb3c504
      
https://github.com/Dolibarr/dolibarr/commit/7b671815e0cfa97ca03bd29fa30517820cb3c504
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #305 from marcosgdf/missing-changelog-entry

Missing changelog entry


  Commit: 640f001bbad43d079b4a270158e5e0b91d657800
      
https://github.com/Dolibarr/dolibarr/commit/640f001bbad43d079b4a270158e5e0b91d657800
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/comm/propal/stats/index.php
    M htdocs/core/class/stats.class.php

  Log Message:
  -----------
  Propal stats weren't showing average total for more than 1 year

Conflicts:
        htdocs/comm/propal/stats/index.php
        htdocs/core/class/stats.class.php


  Commit: f1cbb10edccd3bacd3e622fd375e7a1cf8fa6f24
      
https://github.com/Dolibarr/dolibarr/commit/f1cbb10edccd3bacd3e622fd375e7a1cf8fa6f24
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Fix: wrong user count


  Commit: 40660482d4163d20bdc1eeb3371a377a932eb789
      
https://github.com/Dolibarr/dolibarr/commit/40660482d4163d20bdc1eeb3371a377a932eb789
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/commande/stats/index.php
    M htdocs/compta/deplacement/stats/index.php
    M htdocs/compta/facture/stats/index.php

  Log Message:
  -----------
  Fixed more average amount graph stats. They include:
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense

Conflicts:
        htdocs/commande/stats/index.php


  Commit: acb9380f1c0e784e0c8eaef5287d805f5740b7bf
      
https://github.com/Dolibarr/dolibarr/commit/acb9380f1c0e784e0c8eaef5287d805f5740b7bf
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/commande/class/commandestats.class.php

  Log Message:
  -----------
  Fixed a problem with supplier's orders stats
They were showing orders even if they were not approved or ordered

Conflicts:
        htdocs/commande/class/commandestats.class.php


  Commit: f03e0965e244f8615ded5fff201c88ccc5d5fd4e
      
https://github.com/Dolibarr/dolibarr/commit/f03e0965e244f8615ded5fff201c88ccc5d5fd4e
  Author: Marcos García <address@hidden>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M htdocs/compta/deplacement/stats/index.php
    M htdocs/compta/facture/stats/index.php

  Log Message:
  -----------
  Forgot to rename the variable


  Commit: b2ff7b5ea16753e3278e1b3995f587214d3b99f0
      
https://github.com/Dolibarr/dolibarr/commit/b2ff7b5ea16753e3278e1b3995f587214d3b99f0
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M htdocs/compta/journal/sellsjournal.php

  Log Message:
  -----------
  Fix: limit to products and services


  Commit: 2130b9715cfed50a4f5d6d723b8966b39a27a275
      
https://github.com/Dolibarr/dolibarr/commit/2130b9715cfed50a4f5d6d723b8966b39a27a275
  Author: Marcos García <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Missing changelog entry


  Commit: 594d5ee216824e3e784285d47cf7189e70d0d682
      
https://github.com/Dolibarr/dolibarr/commit/594d5ee216824e3e784285d47cf7189e70d0d682
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #311 from marcosgdf/changelog

Missing changelog entry


  Commit: 1f9e0d3e0004bf0c780d9d0b4eeeddb48fc4ba0e
      
https://github.com/Dolibarr/dolibarr/commit/1f9e0d3e0004bf0c780d9d0b4eeeddb48fc4ba0e
  Author: Marcos García <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M htdocs/product/admin/product_extrafields.php

  Log Message:
  -----------
  Translated message was generating an incomplete string


  Commit: 173ff4f92aac3c66b92b732ba1cc509f982d26ef
      
https://github.com/Dolibarr/dolibarr/commit/173ff4f92aac3c66b92b732ba1cc509f982d26ef
  Author: Marcos García <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M htdocs/projet/tasks/document.php

  Log Message:
  -----------
  Fixed a bug where files were not being uploaded to a project's task
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto

Conflicts:
        htdocs/projet/tasks/document.php


  Commit: 2bd7dc68d327aa0c3108dc874bbb57a73e01a2bb
      
https://github.com/Dolibarr/dolibarr/commit/2bd7dc68d327aa0c3108dc874bbb57a73e01a2bb
  Author: Marcos García <address@hidden>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Project::setClose wasn't setting the new status


  Commit: 5f8530d0c0d56190fcfc54a7ca932343bf7c6e3c
      
https://github.com/Dolibarr/dolibarr/commit/5f8530d0c0d56190fcfc54a7ca932343bf7c6e3c
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M htdocs/compta/paiement/cheque/fiche.php

  Log Message:
  -----------
  Fix: [ bug #503 ] Unable to delete linked file to a deposit

Conflicts:
        htdocs/compta/paiement/cheque/fiche.php


  Commit: 2e38300ec42ab7bd70f1fdb4732aaae7859a149b
      
https://github.com/Dolibarr/dolibarr/commit/2e38300ec42ab7bd70f1fdb4732aaae7859a149b
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php

  Log Message:
  -----------
  Fix: [ bug #501 ] Error while trying to modify an user


  Commit: d6f1f870a210178d1d6b1bf39668bb2d76019c4c
      
https://github.com/Dolibarr/dolibarr/commit/d6f1f870a210178d1d6b1bf39668bb2d76019c4c
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M htdocs/projet/tasks/note.php

  Log Message:
  -----------
  Fix: bad rights


  Commit: b2fa4b3f4925f7764f999d40646f214af8012c4c
      
https://github.com/Dolibarr/dolibarr/commit/b2fa4b3f4925f7764f999d40646f214af8012c4c
  Author: Marcos García <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added missing changelog entries


  Commit: 2355f83295e7eb18a3a6940d81caad15f192ea09
      
https://github.com/Dolibarr/dolibarr/commit/2355f83295e7eb18a3a6940d81caad15f192ea09
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #326 from marcosgdf/changelog

Added missing changelog entries


  Commit: 552c82a032bff426926d230e07826a3b91e5ee6f
      
https://github.com/Dolibarr/dolibarr/commit/552c82a032bff426926d230e07826a3b91e5ee6f
  Author: Marcos García <address@hidden>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

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

  Log Message:
  -----------
  Fixed bug #504
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144


  Commit: cef55097eae6e8643ef7b972b9ee432200477017
      
https://github.com/Dolibarr/dolibarr/commit/cef55097eae6e8643ef7b972b9ee432200477017
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/data/llx_const.sql

  Log Message:
  -----------
  Fix: Default value was not defined


  Commit: 6c2d9baeb587e557592aa7c3f9300cca37704268
      
https://github.com/Dolibarr/dolibarr/commit/6c2d9baeb587e557592aa7c3f9300cca37704268
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql

  Log Message:
  -----------
  Fix: remove old accountancy code, can cause blank screen


  Commit: fb2fd71ff4117ccadc82553638076d767b9bc95e
      
https://github.com/Dolibarr/dolibarr/commit/fb2fd71ff4117ccadc82553638076d767b9bc95e
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql

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


  Commit: cb96735f50d256de50c4b1c962e28317a655413f
      
https://github.com/Dolibarr/dolibarr/commit/cb96735f50d256de50c4b1c962e28317a655413f
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

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

  Log Message:
  -----------
  Fix:  [ bug #506 ] Can't set percentage of a started event


  Commit: 2b0e420618dbb7a9b4130a64dd2e0b557669a692
      
https://github.com/Dolibarr/dolibarr/commit/2b0e420618dbb7a9b4130a64dd2e0b557669a692
  Author: Marcos García <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added missing changelog entry


  Commit: 6e3404a23168c962aa22a5810bc6032fa884d4a6
      
https://github.com/Dolibarr/dolibarr/commit/6e3404a23168c962aa22a5810bc6032fa884d4a6
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Merge pull request #333 from marcosgdf/changelog

Added missing changelog entry


  Commit: 81970b8dd0c2991c6fc59d92e82edb8de3bd03fa
      
https://github.com/Dolibarr/dolibarr/commit/81970b8dd0c2991c6fc59d92e82edb8de3bd03fa
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M htdocs/core/datepicker.php

  Log Message:
  -----------
  Fix: avoid warning "is not a legal ECMA-262 octal constant"


  Commit: f425762e9d9e86c58f7414058e470d7e90cc1562
      
https://github.com/Dolibarr/dolibarr/commit/f425762e9d9e86c58f7414058e470d7e90cc1562
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

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

  Log Message:
  -----------
  Fix: missing show field if "in progress" is chosen first


  Commit: 6bab2e0bd88f8287d424f0a7831fd17f283474c5
      
https://github.com/Dolibarr/dolibarr/commit/6bab2e0bd88f8287d424f0a7831fd17f283474c5
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php

  Log Message:
  -----------
  Fix: The backto use bad url.


  Commit: 2d15b64f242343860f1af26c698575046286966f
      
https://github.com/Dolibarr/dolibarr/commit/2d15b64f242343860f1af26c698575046286966f
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

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

  Log Message:
  -----------
  Fix: wrong ereg


  Commit: 049e5883416cdb1519e9fab87a897cc738724c87
      
https://github.com/Dolibarr/dolibarr/commit/049e5883416cdb1519e9fab87a897cc738724c87
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-22 (Wed, 22 Aug 2012)

  Changed paths:
    M htdocs/admin/barcode.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modBarcode.class.php
    R htdocs/install/mysql/data/llx_c_barcode_type.sql
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
    A htdocs/install/mysql/tables/llx_c_barcode_type.key.sql

  Log Message:
  -----------
  Fix: move barcode type entries in module descriptor for best
compatibility with multicompany


  Commit: 61372f4650da0ce1875e8b77420d22614b6e44eb
      
https://github.com/Dolibarr/dolibarr/commit/61372f4650da0ce1875e8b77420d22614b6e44eb
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-23 (Thu, 23 Aug 2012)

  Changed paths:
    R htdocs/webservices/demo_wsclient_invoice.php
    A htdocs/webservices/demo_wsclient_invoice.php-NORUN
    R htdocs/webservices/demo_wsclient_other.php
    A htdocs/webservices/demo_wsclient_other.php-NORUN
    R htdocs/webservices/demo_wsclient_productorservice.php
    A htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    R htdocs/webservices/demo_wsclient_thirdparty.php
    A htdocs/webservices/demo_wsclient_thirdparty.php-NORUN

  Log Message:
  -----------
  Fix: rename for security raison


  Commit: 084efd03a3d7e365ac44aff32961744d874b949f
      
https://github.com/Dolibarr/dolibarr/commit/084efd03a3d7e365ac44aff32961744d874b949f
  Author: simnandez <address@hidden>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M htdocs/core/modules/modExpedition.class.php

  Log Message:
  -----------
  Fix: Bad assignation of const for pdf delivery module name


  Commit: 0dafeb8e443773e68fa4fd85329c12783df83063
      
https://github.com/Dolibarr/dolibarr/commit/0dafeb8e443773e68fa4fd85329c12783df83063
  Author: simnandez <address@hidden>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix: Bad assignation of const for pdf delivery module name


  Commit: bc2411098c4c7f397c775484e190884a38ec34d5
      
https://github.com/Dolibarr/dolibarr/commit/bc2411098c4c7f397c775484e190884a38ec34d5
  Author: simnandez <address@hidden>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix: Bad assignation of const for pdf delivery module name


  Commit: fef04f69213ab64f3a4df2c47e8f8b6bac46e290
      
https://github.com/Dolibarr/dolibarr/commit/fef04f69213ab64f3a4df2c47e8f8b6bac46e290
  Author: simnandez <address@hidden>
  Date:   2012-08-24 (Fri, 24 Aug 2012)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Fix: Bad assignation of const for pdf delivery module name


  Commit: e260997e0b04c572ae32cb78c7a374887e66c96f
      
https://github.com/Dolibarr/dolibarr/commit/e260997e0b04c572ae32cb78c7a374887e66c96f
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
    M ChangeLog
    M htdocs/core/modules/modExpedition.class.php
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Merge pull request #345 from simnandez/3.2

Fix: Bad assignation of const for pdf delivery module name


  Commit: c5728843a52606396970ccfb2a32cf0bc37f3f00
      
https://github.com/Dolibarr/dolibarr/commit/c5728843a52606396970ccfb2a32cf0bc37f3f00
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/core/modules/modExpedition.class.php

  Log Message:
  -----------
  Fix: remove obsolete code

Conflicts:
        htdocs/admin/expedition.php


  Commit: 87cc60d647a50bd77a1aeb24ee5eda132bfc511d
      
https://github.com/Dolibarr/dolibarr/commit/87cc60d647a50bd77a1aeb24ee5eda132bfc511d
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
    M htdocs/admin/expedition.php
    M htdocs/core/modules/modExpedition.class.php

  Log Message:
  -----------
  Revert "Fix: remove obsolete code"

This reverts commit c5728843a52606396970ccfb2a32cf0bc37f3f00.


  Commit: 9142e3400b22dd38e59c3f5600c8d0a2e1f1870b
      
https://github.com/Dolibarr/dolibarr/commit/9142e3400b22dd38e59c3f5600c8d0a2e1f1870b
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-25 (Sat, 25 Aug 2012)

  Changed paths:
    M htdocs/admin/tools/export.php

  Log Message:
  -----------
  Fix: [ bug #254 ] Database backup not working with complex passwords


  Commit: fe7690234286c4695ddab8a49db5b8d7ea76e118
      
https://github.com/Dolibarr/dolibarr/commit/fe7690234286c4695ddab8a49db5b8d7ea76e118
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M htdocs/adherents/index.php

  Log Message:
  -----------
  Fix: Bad field


  Commit: e121ab8c86230246964368af4342535832a41565
      
https://github.com/Dolibarr/dolibarr/commit/e121ab8c86230246964368af4342535832a41565
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M htdocs/compta/bank/account.php

  Log Message:
  -----------
  [ bug #512 ] Filter system not working in banks > account > transactions

Conflicts:
        htdocs/compta/bank/account.php


  Commit: 85eedfa6e71bde1f2d41664f3d627d9b7ff7047f
      
https://github.com/Dolibarr/dolibarr/commit/85eedfa6e71bde1f2d41664f3d627d9b7ff7047f
  Author: simnandez <address@hidden>
  Date:   2012-08-26 (Sun, 26 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Fix: Bad assignation of const for pdf delivery module name


  Commit: bdc330ad6a984de5ef5a6e7fea1480d323772c29
      
https://github.com/Dolibarr/dolibarr/commit/bdc330ad6a984de5ef5a6e7fea1480d323772c29
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M htdocs/install/mysql/migration/repair.sql

  Log Message:
  -----------
  Merge pull request #351 from simnandez/3.2

Fix: Bad assignation of const for pdf delivery module name


  Commit: 849dc8c83606198d2a8c93c0d6976464a968b663
      
https://github.com/Dolibarr/dolibarr/commit/849dc8c83606198d2a8c93c0d6976464a968b663
  Author: Marcos García <address@hidden>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M COPYRIGHT

  Log Message:
  -----------
  Added me to the COPYRIGHT file


  Commit: 5c2ce8a301791987087688420f5a51e985cc85d5
      
https://github.com/Dolibarr/dolibarr/commit/5c2ce8a301791987087688420f5a51e985cc85d5
  Author: Regis Houssin <address@hidden>
  Date:   2012-08-27 (Mon, 27 Aug 2012)

  Changed paths:
    M COPYRIGHT

  Log Message:
  -----------
  Merge pull request #354 from marcosgdf/missing-licensing

Added me to the COPYRIGHT file


  Commit: 05de9c19c3e15c083443bffb1c36f0af2cf6b571
      
https://github.com/Dolibarr/dolibarr/commit/05de9c19c3e15c083443bffb1c36f0af2cf6b571
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Fix: permission for a user to view its own card using webservice


  Commit: e5c2d07c53c906f516aefa4bdc5540e3aaf18f9d
      
https://github.com/Dolibarr/dolibarr/commit/e5c2d07c53c906f516aefa4bdc5540e3aaf18f9d
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M build/pad/DoliWamp.pml
    M build/pad/Dolibarr.pml
    M build/pad/pad_dolibarr.xml
    M build/pad/pad_doliwamp.xml
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/index.php
    M htdocs/admin/barcode.php
    M htdocs/admin/tools/export.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/action/index.php
    M htdocs/comm/propal/stats/index.php
    M htdocs/commande/class/commandestats.class.php
    M htdocs/commande/stats/index.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/deplacement/stats/index.php
    M htdocs/compta/facture/stats/index.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/paiement/cheque/fiche.php
    M htdocs/core/class/html.formactions.class.php
    M htdocs/core/class/stats.class.php
    M htdocs/core/datepicker.php
    M htdocs/core/lib/admin.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modBarcode.class.php
    M htdocs/core/modules/modExpedition.class.php
    R htdocs/install/mysql/data/llx_c_barcode_type.sql
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
    M htdocs/install/mysql/migration/repair.sql
    A htdocs/install/mysql/tables/llx_c_barcode_type.key.sql
    M htdocs/product/admin/product.php
    M htdocs/product/admin/product_extrafields.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/note.php
    M htdocs/public/members/new.php
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php
    R htdocs/webservices/demo_wsclient_invoice.php
    A htdocs/webservices/demo_wsclient_invoice.php-NORUN
    R htdocs/webservices/demo_wsclient_other.php
    A htdocs/webservices/demo_wsclient_other.php-NORUN
    R htdocs/webservices/demo_wsclient_productorservice.php
    A htdocs/webservices/demo_wsclient_productorservice.php-NORUN
    R htdocs/webservices/demo_wsclient_thirdparty.php
    A htdocs/webservices/demo_wsclient_thirdparty.php-NORUN

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


  Commit: d4ac506d667eb5ea618207de0cabd31a0a12b904
      
https://github.com/Dolibarr/dolibarr/commit/d4ac506d667eb5ea618207de0cabd31a0a12b904
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

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

  Log Message:
  -----------
  Missing translation key


  Commit: 6c62b64b7ca8bad8c9d250449a963fc98695c615
      
https://github.com/Dolibarr/dolibarr/commit/6c62b64b7ca8bad8c9d250449a963fc98695c615
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M htdocs/user/class/user.class.php
    M htdocs/webservices/server_user.php

  Log Message:
  -----------
  Fix: Test on ref and ref_ext into webservice


  Commit: 5f197cb1bbc7af4ec6cca350344e90dcc5590347
      
https://github.com/Dolibarr/dolibarr/commit/5f197cb1bbc7af4ec6cca350344e90dcc5590347
  Author: Laurent Destailleur <address@hidden>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M build/makepack-dolibarr.pl

  Log Message:
  -----------
  Fix: Packaging for 3.2.1 of zip


Compare: 
https://github.com/Dolibarr/dolibarr/compare/58b2b91928a8...5f197cb1bbc7

reply via email to

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