[Dolibarr-git] [Dolibarr/dolibarr] abe53c: fix #8004

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: abe53cad05dfb01e1a89808f4a0d231b30bc69b9
      
https://github.com/Dolibarr/dolibarr/commit/abe53cad05dfb01e1a89808f4a0d231b30bc69b9
  Author: florian HENRY <address@hidden>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php

  Log Message:
  -----------
  fix #8004


  Commit: 320465aeb9938c5aec5bfb0457d22df688fd047e
      
https://github.com/Dolibarr/dolibarr/commit/320465aeb9938c5aec5bfb0457d22df688fd047e
  Author: florian HENRY <address@hidden>
  Date:   2018-01-02 (Tue, 02 Jan 2018)

  Changed paths:
    M htdocs/install/mysql/tables/llx_inventory.key.sql

  Log Message:
  -----------
  fix : #8003


  Commit: 2bd8bafc1fdc808028072591cecc4a0795268a13
      
https://github.com/Dolibarr/dolibarr/commit/2bd8bafc1fdc808028072591cecc4a0795268a13
  Author: florian HENRY <address@hidden>
  Date:   2018-01-03 (Wed, 03 Jan 2018)

  Changed paths:
    M htdocs/core/class/html.formfile.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/document.php
    M htdocs/install/mysql/data/llx_c_tva.sql
    M htdocs/public/website/index.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/website/index.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


  Commit: cc24634cfd7851f4063ac3b663331af996f21461
      
https://github.com/Dolibarr/dolibarr/commit/cc24634cfd7851f4063ac3b663331af996f21461
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-04 (Thu, 04 Jan 2018)

  Changed paths:
    M htdocs/blockedlog/class/blockedlog.class.php
    M htdocs/install/mysql/tables/llx_inventory.key.sql

  Log Message:
  -----------
  Merge pull request #8007 from atm-florian/develop

fix #8004


Compare: 
https://github.com/Dolibarr/dolibarr/compare/90e9b3db6841...cc24634cfd78