[Dolibarr-git] [Dolibarr/dolibarr] dc1d41: Merge branch 'develop' of address@hidden:Dolibarr/...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: dc1d41d529f9ba6fa8b71c401388868ac93e591c
      
https://github.com/Dolibarr/dolibarr/commit/dc1d41d529f9ba6fa8b71c401388868ac93e591c
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/adherents/class/adherent.class.php
    M htdocs/admin/prelevement.php
    M htdocs/bookmarks/class/bookmark.class.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/list.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/ligneprelevement.class.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contact/class/contact.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/modules/mailings/contacts3.modules.php
    M htdocs/core/modules/mailings/contacts4.modules.php
    M htdocs/core/modules/mailings/thirdparties.modules.php
    M htdocs/core/modules/modCategorie.class.php
    M htdocs/core/modules/modUser.class.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/filefunc.inc.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/fourn/list.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.key.sql
    M htdocs/install/mysql/tables/llx_categorie_fournisseur.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.key.sql
    M htdocs/install/mysql/tables/llx_categorie_societe.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.key.sql
    M htdocs/install/mysql/tables/llx_user.key.sql
    M htdocs/install/mysql/tables/llx_user.sql
    M htdocs/langs/en_US/companies.lang
    M htdocs/livraison/class/livraison.class.php
    M htdocs/product/class/product.class.php
    M htdocs/projet/class/project.class.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/soc.php
    M htdocs/societe/societe.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php
    M htdocs/user/home.php
    M htdocs/user/index.php
    M htdocs/webservices/server_thirdparty.php

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


  Commit: c678a31d973a2a66586feea6da17afc5a255b616
      
https://github.com/Dolibarr/dolibarr/commit/c678a31d973a2a66586feea6da17afc5a255b616
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/filefunc.inc.php

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


  Commit: adad1f4a3bfa1143eef091c8cb986e352dcda80c
      
https://github.com/Dolibarr/dolibarr/commit/adad1f4a3bfa1143eef091c8cb986e352dcda80c
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M dev/translation/sanity_check_en_langfiles.php

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


  Commit: f2018b7946426a5a0f298bc9f2879e116e712033
      
https://github.com/Dolibarr/dolibarr/commit/f2018b7946426a5a0f298bc9f2879e116e712033
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  fix bug #2652


  Commit: 11e1d0310c588e42edc0dcd3c86fab8aefbb1e27
      
https://github.com/Dolibarr/dolibarr/commit/11e1d0310c588e42edc0dcd3c86fab8aefbb1e27
  Author: Florian HENRY <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/install/mysql/tables/llx_user.sql

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


  Commit: 5c80d46b7495c3f77fd605f929261fda7e65f4ee
      
https://github.com/Dolibarr/dolibarr/commit/5c80d46b7495c3f77fd605f929261fda7e65f4ee
  Author: Laurent Destailleur <address@hidden>
  Date:   2015-04-18 (Sat, 18 Apr 2015)

  Changed paths:
    M htdocs/comm/askpricesupplier/card.php
    M htdocs/comm/propal.php
    M htdocs/compta/facture.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/expedition/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/facture/card.php
    M htdocs/install/mysql/tables/llx_user.sql

  Log Message:
  -----------
  Merge pull request #2663 from FHenry/develop

fix bug #2652


Compare: 
https://github.com/Dolibarr/dolibarr/compare/065711df3b6e...5c80d46b7495