[Dolibarr-git] [Dolibarr/dolibarr] d22f66: Merge remote-tracking branch 'origin/3.5' into 3.6...

[Laurent Destailleur]

  Branch: refs/heads/3.6_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d22f660cb2ce3160c5c0832f9416a13809d7e017
      
https://github.com/Dolibarr/dolibarr/commit/d22f660cb2ce3160c5c0832f9416a13809d7e017
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/fiche.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture.php
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/tpl/document_actions_pre_headers.tpl.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/product/fiche.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 remote-tracking branch 'origin/3.5' into 3.6_backported

Conflicts:
        ChangeLog
        htdocs/compta/facture.php
        htdocs/core/js/lib_head.js


  Commit: d686898343d3aae56e8bbaf0548cb575a7d1fec1
      
https://github.com/Dolibarr/dolibarr/commit/d686898343d3aae56e8bbaf0548cb575a7d1fec1
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2b9fdabca2df...d686898343d3