[Dolibarr-git] [Dolibarr/dolibarr] 1b1b58: Merge branch '3.2' of https://github.com/Dolibarr/...

[Regis Houssin]

  Branch: refs/heads/3.2
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1b1b58ad5adb58b0bdcf342853ce44f2c57e9e25
      
https://github.com/Dolibarr/dolibarr/commit/1b1b58ad5adb58b0bdcf342853ce44f2c57e9e25
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-21 (Mon, 21 May 2012)

  Changed paths:
    M htdocs/adherents/index.php
    M htdocs/comm/propal.php
    M htdocs/public/members/new.php

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


  Commit: 96294403e2b8d451113759c23f14d0dc6381f227
      
https://github.com/Dolibarr/dolibarr/commit/96294403e2b8d451113759c23f14d0dc6381f227
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-22 (Tue, 22 May 2012)

  Changed paths:
    M htdocs/comm/mailing/cibles.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/societe/soc.php

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


  Commit: ffaadcc930ce833bf20327908f8cdd5649e81053
      
https://github.com/Dolibarr/dolibarr/commit/ffaadcc930ce833bf20327908f8cdd5649e81053
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-24 (Thu, 24 May 2012)

  Changed paths:
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
    M htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
    M htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
    M htdocs/ecm/index.php
    M htdocs/install/mysql/migration/3.1.0-3.2.0.sql
    M htdocs/install/repair.php
    M htdocs/product/fournisseurs.php
    M htdocs/projet/class/project.class.php
    M htdocs/projet/contact.php
    M htdocs/projet/document.php
    M htdocs/projet/element.php
    M htdocs/projet/fiche.php
    M htdocs/projet/ganttview.php
    M htdocs/projet/note.php
    M htdocs/projet/tasks.php
    M htdocs/user/class/user.class.php

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


  Commit: 82af0ed28f223d1324c8843abb106c8ee6af9a4b
      
https://github.com/Dolibarr/dolibarr/commit/82af0ed28f223d1324c8843abb106c8ee6af9a4b
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M htdocs/compta/facture.php

  Log Message:
  -----------
  Fixed a bug preventing invoice sorting by authors


  Commit: 76f8d1d37c1e7e159a84a676b0d7e61f84f3d9b7
      
https://github.com/Dolibarr/dolibarr/commit/76f8d1d37c1e7e159a84a676b0d7e61f84f3d9b7
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-29 (Tue, 29 May 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/contrat/document.php
    M htdocs/core/ajax/fileupload.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/product/document.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php

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


  Commit: 2812bfae7a5e7b02c724f9d5cfce99d26c14e27f
      
https://github.com/Dolibarr/dolibarr/commit/2812bfae7a5e7b02c724f9d5cfce99d26c14e27f
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

  Changed paths:
    M htdocs/adherents/document.php
    M htdocs/admin/mails.php
    M htdocs/admin/security_other.php
    M htdocs/comm/action/document.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/document.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/prelevement/fiche.php
    M htdocs/compta/sociales/document.php
    R htdocs/contact/canvas/default/dao_contact_default.class.php
    M htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
    M htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
    M htdocs/contrat/document.php
    M htdocs/core/ajax/fileupload.php
    M htdocs/core/class/canvas.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/document.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/docother.php
    M htdocs/ecm/index.php
    M htdocs/fichinter/document.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/fiche.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/ftp/index.php
    M htdocs/imports/import.php
    M htdocs/install/check.php
    M htdocs/langs/de_DE/admin.lang
    M htdocs/langs/de_DE/agenda.lang
    M htdocs/langs/de_DE/banks.lang
    M htdocs/langs/de_DE/bills.lang
    M htdocs/langs/de_DE/bookmarks.lang
    M htdocs/langs/de_DE/boxes.lang
    M htdocs/langs/de_DE/cashdesk.lang
    M htdocs/langs/de_DE/categories.lang
    M htdocs/langs/de_DE/commercial.lang
    M htdocs/langs/de_DE/companies.lang
    M htdocs/langs/de_DE/compta.lang
    M htdocs/langs/de_DE/contracts.lang
    M htdocs/langs/de_DE/deliveries.lang
    M htdocs/langs/de_DE/dict.lang
    M htdocs/langs/de_DE/donations.lang
    M htdocs/langs/de_DE/ecm.lang
    M htdocs/langs/de_DE/errors.lang
    M htdocs/langs/de_DE/exports.lang
    M htdocs/langs/de_DE/externalsite.lang
    M htdocs/langs/de_DE/ftp.lang
    M htdocs/langs/de_DE/help.lang
    M htdocs/langs/de_DE/install.lang
    M htdocs/langs/de_DE/interventions.lang
    M htdocs/langs/de_DE/languages.lang
    M htdocs/langs/de_DE/ldap.lang
    M htdocs/langs/de_DE/mails.lang
    M htdocs/langs/de_DE/main.lang
    M htdocs/langs/de_DE/members.lang
    M htdocs/langs/de_DE/orders.lang
    M htdocs/langs/de_DE/oscommerce.lang
    M htdocs/langs/de_DE/other.lang
    M htdocs/langs/de_DE/paybox.lang
    M htdocs/langs/de_DE/paypal.lang
    M htdocs/langs/de_DE/products.lang
    M htdocs/langs/de_DE/projects.lang
    M htdocs/langs/de_DE/propal.lang
    M htdocs/langs/de_DE/sendings.lang
    M htdocs/langs/de_DE/shop.lang
    M htdocs/langs/de_DE/sms.lang
    M htdocs/langs/de_DE/stocks.lang
    M htdocs/langs/de_DE/suppliers.lang
    M htdocs/langs/de_DE/trips.lang
    M htdocs/langs/de_DE/users.lang
    M htdocs/langs/de_DE/withdrawals.lang
    M htdocs/langs/de_DE/workflow.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/main.lang
    M htdocs/product/canvas/product/tpl/card_create.tpl.php
    M htdocs/product/document.php
    M htdocs/product/fiche.php
    M htdocs/projet/document.php
    M htdocs/projet/fiche.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php
    M htdocs/user/class/usergroup.class.php
    M htdocs/viewimage.php

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


  Commit: 086a0ae340612d7dfe1318fd847f3b9b94bff890
      
https://github.com/Dolibarr/dolibarr/commit/086a0ae340612d7dfe1318fd847f3b9b94bff890
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-30 (Wed, 30 May 2012)

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

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


  Commit: 0a8016e2aa2b179639854806221c4c6768704a91
      
https://github.com/Dolibarr/dolibarr/commit/0a8016e2aa2b179639854806221c4c6768704a91
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-05-31 (Thu, 31 May 2012)

  Changed paths:
    M COPYRIGHT
    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/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
    M htdocs/includes/jquery/plugins/fileupload/README.md
    R htdocs/includes/jquery/plugins/fileupload/README.txt
    A htdocs/includes/jquery/plugins/fileupload/css/jquery.fileupload-ui.css
    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/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-jui.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/locale.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:
  -----------
  Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2


  Commit: 20d90831e1f4f3677b1fb54db7c9624a8741dac6
      
https://github.com/Dolibarr/dolibarr/commit/20d90831e1f4f3677b1fb54db7c9624a8741dac6
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2012-06-01 (Fri, 01 Jun 2012)

  Changed paths:
    M htdocs/fichinter/list.php

  Log Message:
  -----------
  Fixed a bug in interventions' list navigation

The navigation arrows were referencing "index.php" file thus
preventing navigation between pages.
The actual name of the file is "list.php".


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

  Changed paths:
    M htdocs/fichinter/list.php

  Log Message:
  -----------
  Merge pull request #217 from GPCsolutions/3.2

Fixed a bug in intervention's list navigation


Compare: https://github.com/Dolibarr/dolibarr/compare/9c42cdc...d11971d