[Dolibarr-git] [Dolibarr/dolibarr] 8e4c3d: Merge branch 'upstream/develop'

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8e4c3dbd1bebb6c3820acb2c463f3b46aac6a199
      
https://github.com/Dolibarr/dolibarr/commit/8e4c3dbd1bebb6c3820acb2c463f3b46aac6a199
  Author: aspangaro <address@hidden>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ChangeLog
    M build/debian/README.howto
    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 dev/initdata/mysqldump_dolibarr_3.5.0.sql
    M htdocs/adherents/document.php
    M htdocs/comm/action/document.php
    M htdocs/comm/propal/document.php
    M htdocs/commande/document.php
    M htdocs/compta/bank/account.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/sociales/document.php
    M htdocs/contrat/document.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/security.lib.php
    A htdocs/core/tpl/document_actions_post_headers.tpl.php
    A htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/ecm/index.php
    M htdocs/fichinter/document.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    A htdocs/install/mysql/tables/llx_links.sql
    M htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
    A htdocs/langs/en_US/link.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/langs/fr_FR/compta.lang
    A htdocs/langs/fr_FR/link.lang
    M htdocs/langs/fr_FR/main.lang
    A htdocs/link/class/link.class.php
    M htdocs/opensurvey/public/create_survey.php
    M htdocs/product/class/product.class.php
    M htdocs/product/document.php
    M htdocs/product/price.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/societe/document.php

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


  Commit: 6a86c31067c87d1653ec11e94524771f5a58f235
      
https://github.com/Dolibarr/dolibarr/commit/6a86c31067c87d1653ec11e94524771f5a58f235
  Author: aspangaro <address@hidden>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

  Log Message:
  -----------
  Update Skype Module


  Commit: bb69fcf0d78511925b2f5c9d7c7e365c79e7f1a9
      
https://github.com/Dolibarr/dolibarr/commit/bb69fcf0d78511925b2f5c9d7c7e365c79e7f1a9
  Author: aspangaro <address@hidden>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

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

  Log Message:
  -----------
  Fix for language


  Commit: 238b483ad80a015196cda98e8560227dfca1a19d
      
https://github.com/Dolibarr/dolibarr/commit/238b483ad80a015196cda98e8560227dfca1a19d
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-09 (Sat, 09 Nov 2013)

  Changed paths:
    M htdocs/compta/bank/account.php
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/companies.lang
    M htdocs/user/class/user.class.php
    M htdocs/user/fiche.php

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

Update Skype module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4d664fee3a99...238b483ad80a