[Dolibarr-git] [Dolibarr/dolibarr] 9b40cc: fix

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
      
https://github.com/Dolibarr/dolibarr/commit/9b40cc9e891fc817ddd5ce65abffe7b8d3ef5e85
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  fix


  Commit: b04eae95e5e72f3768e010af9bc4890ee623cc2a
      
https://github.com/Dolibarr/dolibarr/commit/b04eae95e5e72f3768e010af9bc4890ee623cc2a
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-03 (Wed, 03 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/fourn/facture/fiche.php
    M htdocs/langs/en_US/resource.lang
    M htdocs/langs/fr_FR/resource.lang
    M htdocs/product/fiche.php
    M htdocs/product/price.php
    M htdocs/resource/class/actions_resource.class.php
    M htdocs/resource/class/resource.class.php
    M htdocs/resource/element_resource.php
    M htdocs/societe/price.php
    M htdocs/theme/amarok/style.css.php
    M htdocs/theme/auguria/style.css.php
    M htdocs/theme/bureau2crea/style.css.php
    M htdocs/theme/cameleo/style.css.php
    M htdocs/theme/eldy/style.css.php

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


  Commit: 85cabbf921b88150cd57f2ff0e23db9d9d67fb04
      
https://github.com/Dolibarr/dolibarr/commit/85cabbf921b88150cd57f2ff0e23db9d9d67fb04
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-04 (Thu, 04 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/facture/prelevement.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/core/class/html.formfile.class.php

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

Conflicts:
        ChangeLog


  Commit: 7851587a114cdb53652be2cfcddb293783236ae5
      
https://github.com/Dolibarr/dolibarr/commit/7851587a114cdb53652be2cfcddb293783236ae5
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-11 (Thu, 11 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/core/class/extrafields.class.php

  Log Message:
  -----------
  Merge pull request #1869 from FHenry/3.6

Extrafield feature select from table should try to translate multiple column 
when not needed


Compare: 
https://github.com/Dolibarr/dolibarr/compare/5a93a7620c3a...7851587a114c