[Dolibarr-git] [Dolibarr/dolibarr] f745c8: Fix: error during upgrade process

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f745c8739405c6e4e1bbcb1cb50833cbf6cfab33
      
https://github.com/Dolibarr/dolibarr/commit/f745c8739405c6e4e1bbcb1cb50833cbf6cfab33
  Author: Regis Houssin <address@hidden>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M htdocs/core/modules/modProduct.class.php

  Log Message:
  -----------
  Fix: error during upgrade process


  Commit: 9ca12c9d11724c6e845ede2a64f51339f49df435
      
https://github.com/Dolibarr/dolibarr/commit/9ca12c9d11724c6e845ede2a64f51339f49df435
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M htdocs/core/modules/modProduct.class.php

  Log Message:
  -----------
  Merge pull request #7141 from hregis/6.0

Fix: error during upgrade process


Compare: 
https://github.com/Dolibarr/dolibarr/compare/58ce8eaf4620...9ca12c9d1172