[Dolibarr/dolibarr] 4d12ec: FIX #12745

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4d12ecb072e20db60817547455aa7d9d53d8c484
      
https://github.com/Dolibarr/dolibarr/commit/4d12ecb072e20db60817547455aa7d9d53d8c484
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-23 (Mon, 23 Dec 2019)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php

  Log Message:
  -----------
  FIX #12745


  Commit: e963fa4b07f06cf10549007bf775d0fc32fef3be
      
https://github.com/Dolibarr/dolibarr/commit/e963fa4b07f06cf10549007bf775d0fc32fef3be
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-12-23 (Mon, 23 Dec 2019)

  Changed paths:
    M htdocs/core/class/CMailFile.class.php
    M htdocs/install/mysql/data/llx_c_units.sql
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/77ab6604fd33...e963fa4b07f0