[Dolibarr-git] [Dolibarr/dolibarr] 255c46: Merge branch 'upstream/develop'

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 255c469b67f9a54e2da46a2a201cdaa261b61052
      
https://github.com/Dolibarr/dolibarr/commit/255c469b67f9a54e2da46a2a201cdaa261b61052
  Author: aspangaro <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M README-FR
    M htdocs/adherents/admin/adherent.php
    M htdocs/adherents/class/adherent.class.php
    M htdocs/adherents/fiche.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/ldap_contacts.php
    M htdocs/admin/ldap_members.php
    M htdocs/admin/ldap_users.php
    M htdocs/comm/fiche.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/propal.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/commande/document.php
    M htdocs/commande/fiche.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/admin/facture_cust_extrafields.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contact/fiche.php
    M htdocs/contact/list.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/ldap.class.php
    M htdocs/core/lib/company.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/xcal.lib.php
    M htdocs/core/modules/modProjet.class.php
    A htdocs/core/modules/modSkype.class.php
    M htdocs/cron/card.php
    M htdocs/cron/list.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/admin/fichinter_extrafields.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/fichinter/fiche.php
    M htdocs/fichinter/info.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/facture/document.php
    M htdocs/fourn/fiche.php
    M htdocs/install/mysql/migration/3.4.0-3.5.0.sql
    M htdocs/install/mysql/tables/llx_adherent.sql
    M htdocs/install/mysql/tables/llx_societe.sql
    M htdocs/install/mysql/tables/llx_socpeople.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/companies.lang
    M htdocs/langs/en_US/members.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/langs/fr_FR/cron.lang
    M htdocs/langs/fr_FR/members.lang
    M htdocs/projet/activity/list.php
    M htdocs/societe/canvas/actions_card_common.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    A htdocs/theme/amarok/img/object_skype.png
    A htdocs/theme/auguria/img/object_skype.png
    A htdocs/theme/bureau2crea/img/object_skype.png
    A htdocs/theme/cameleo/img/object_skype.png
    A htdocs/theme/eldy/img/object_skype.png

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


  Commit: 092c98e6aa0ecb3cc83c61f3941dde4044948a28
      
https://github.com/Dolibarr/dolibarr/commit/092c98e6aa0ecb3cc83c61f3941dde4044948a28
  Author: aspangaro <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  Changelog & lang en_US for Skype module


  Commit: 9a0471286a70ae6eb7b8fccebf5af0a509c68762
      
https://github.com/Dolibarr/dolibarr/commit/9a0471286a70ae6eb7b8fccebf5af0a509c68762
  Author: Laurent Destailleur <address@hidden>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ChangeLog
    M htdocs/langs/en_US/admin.lang

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

Changelog & lang en_US for Skype module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/27b33cafe65a...9a0471286a70