[Dolibarr-git] [Dolibarr/dolibarr] 6b6467: Merge branch 'upstream/develop'

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6b6467b86ca6e07d88d9c81e13740f8b2db9b790
      
https://github.com/Dolibarr/dolibarr/commit/6b6467b86ca6e07d88d9c81e13740f8b2db9b790
  Author: aspangaro <address@hidden>
  Date:   2013-11-09 (Sat, 09 Nov 2013)

  Changed paths:
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/class/cactioncomm.class.php
    M htdocs/comm/action/class/ical.class.php
    M htdocs/comm/action/fiche.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/js/lib_head.js
    M htdocs/core/lib/agenda.lib.php
    M htdocs/core/lib/date.lib.php
    M htdocs/core/lib/ecm.lib.php
    M htdocs/core/lib/files.lib.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/propal.lib.php
    M htdocs/core/modules/propale/modules_propale.php
    M htdocs/ecm/class/ecmdirectory.class.php
    M htdocs/ftp/index.php
    R htdocs/install/mysql/tables/llx_soc_localtaxes
    R htdocs/install/mysql/tables/llx_soc_localtaxes.key.sql
    A htdocs/langs/lv_LV/admin.lang
    A htdocs/langs/lv_LV/agenda.lang
    A htdocs/langs/lv_LV/banks.lang
    A htdocs/langs/lv_LV/bills.lang
    A htdocs/langs/lv_LV/bookmarks.lang
    A htdocs/langs/lv_LV/boxes.lang
    A htdocs/langs/lv_LV/cashdesk.lang
    A htdocs/langs/lv_LV/categories.lang
    A htdocs/langs/lv_LV/commercial.lang
    A htdocs/langs/lv_LV/companies.lang
    A htdocs/langs/lv_LV/compta.lang
    A htdocs/langs/lv_LV/contracts.lang
    A htdocs/langs/lv_LV/cron.lang
    A htdocs/langs/lv_LV/deliveries.lang
    A htdocs/langs/lv_LV/dict.lang
    A htdocs/langs/lv_LV/donations.lang
    A htdocs/langs/lv_LV/ecm.lang
    A htdocs/langs/lv_LV/errors.lang
    A htdocs/langs/lv_LV/exports.lang
    A htdocs/langs/lv_LV/externalsite.lang
    A htdocs/langs/lv_LV/ftp.lang
    A htdocs/langs/lv_LV/help.lang
    A htdocs/langs/lv_LV/holiday.lang
    A htdocs/langs/lv_LV/install.lang
    A htdocs/langs/lv_LV/interventions.lang
    A htdocs/langs/lv_LV/languages.lang
    A htdocs/langs/lv_LV/ldap.lang
    A htdocs/langs/lv_LV/link.lang
    A htdocs/langs/lv_LV/mailmanspip.lang
    A htdocs/langs/lv_LV/mails.lang
    A htdocs/langs/lv_LV/main.lang
    A htdocs/langs/lv_LV/margins.lang
    A htdocs/langs/lv_LV/members.lang
    A htdocs/langs/lv_LV/opensurvey.lang
    A htdocs/langs/lv_LV/orders.lang
    A htdocs/langs/lv_LV/oscommerce.lang
    A htdocs/langs/lv_LV/other.lang
    A htdocs/langs/lv_LV/paybox.lang
    A htdocs/langs/lv_LV/paypal.lang
    A htdocs/langs/lv_LV/printipp.lang
    A htdocs/langs/lv_LV/products.lang
    A htdocs/langs/lv_LV/projects.lang
    A htdocs/langs/lv_LV/propal.lang
    A htdocs/langs/lv_LV/sendings.lang
    A htdocs/langs/lv_LV/shop.lang
    A htdocs/langs/lv_LV/sms.lang
    A htdocs/langs/lv_LV/stocks.lang
    A htdocs/langs/lv_LV/suppliers.lang
    A htdocs/langs/lv_LV/trips.lang
    A htdocs/langs/lv_LV/users.lang
    A htdocs/langs/lv_LV/withdrawals.lang
    A htdocs/langs/lv_LV/workflow.lang
    A htdocs/langs/sk_SK/admin.lang
    A htdocs/langs/sk_SK/agenda.lang
    A htdocs/langs/sk_SK/banks.lang
    A htdocs/langs/sk_SK/bills.lang
    A htdocs/langs/sk_SK/bookmarks.lang
    A htdocs/langs/sk_SK/boxes.lang
    A htdocs/langs/sk_SK/cashdesk.lang
    A htdocs/langs/sk_SK/categories.lang
    A htdocs/langs/sk_SK/commercial.lang
    A htdocs/langs/sk_SK/companies.lang
    A htdocs/langs/sk_SK/compta.lang
    A htdocs/langs/sk_SK/contracts.lang
    A htdocs/langs/sk_SK/cron.lang
    A htdocs/langs/sk_SK/deliveries.lang
    A htdocs/langs/sk_SK/dict.lang
    A htdocs/langs/sk_SK/donations.lang
    A htdocs/langs/sk_SK/ecm.lang
    A htdocs/langs/sk_SK/errors.lang
    A htdocs/langs/sk_SK/exports.lang
    A htdocs/langs/sk_SK/externalsite.lang
    A htdocs/langs/sk_SK/ftp.lang
    A htdocs/langs/sk_SK/help.lang
    A htdocs/langs/sk_SK/holiday.lang
    A htdocs/langs/sk_SK/install.lang
    A htdocs/langs/sk_SK/interventions.lang
    A htdocs/langs/sk_SK/languages.lang
    A htdocs/langs/sk_SK/ldap.lang
    A htdocs/langs/sk_SK/link.lang
    A htdocs/langs/sk_SK/mailmanspip.lang
    A htdocs/langs/sk_SK/mails.lang
    A htdocs/langs/sk_SK/main.lang
    A htdocs/langs/sk_SK/margins.lang
    A htdocs/langs/sk_SK/members.lang
    A htdocs/langs/sk_SK/opensurvey.lang
    A htdocs/langs/sk_SK/orders.lang
    A htdocs/langs/sk_SK/oscommerce.lang
    A htdocs/langs/sk_SK/other.lang
    A htdocs/langs/sk_SK/paybox.lang
    A htdocs/langs/sk_SK/paypal.lang
    A htdocs/langs/sk_SK/printipp.lang
    A htdocs/langs/sk_SK/products.lang
    A htdocs/langs/sk_SK/projects.lang
    A htdocs/langs/sk_SK/propal.lang
    A htdocs/langs/sk_SK/sendings.lang
    A htdocs/langs/sk_SK/shop.lang
    A htdocs/langs/sk_SK/sms.lang
    A htdocs/langs/sk_SK/stocks.lang
    A htdocs/langs/sk_SK/suppliers.lang
    A htdocs/langs/sk_SK/trips.lang
    A htdocs/langs/sk_SK/users.lang
    A htdocs/langs/sk_SK/withdrawals.lang
    A htdocs/langs/sk_SK/workflow.lang
    M htdocs/societe/class/societe.class.php

  Log Message:
  -----------
  Merge branch 'upstream/develop'


  Commit: 86a2da31b408fb24c76bf2d5548ab475a4caf11f
      
https://github.com/Dolibarr/dolibarr/commit/86a2da31b408fb24c76bf2d5548ab475a4caf11f
  Author: aspangaro <address@hidden>
  Date:   2013-11-09 (Sat, 09 Nov 2013)

  Changed paths:
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php

  Log Message:
  -----------
  Fix for document cerfa into module Don


  Commit: b549f62e1dca6a8e79fdb65bb0e9fe2ea9448a83
      
https://github.com/Dolibarr/dolibarr/commit/b549f62e1dca6a8e79fdb65bb0e9fe2ea9448a83
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M htdocs/core/modules/dons/html_cerfafr.html
    M htdocs/core/modules/dons/html_cerfafr.modules.php

  Log Message:
  -----------
  Merge pull request #1294 from aspangaro/develop

Fix for document cerfa into module Don


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b3eec934b830...b549f62e1dca