[Dolibarr-git] [Dolibarr/dolibarr] c4be61: FIX Better compatible fix for the trouble of weigh...

[Laurent Destailleur]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c4be61c55cf506feb39021abb09561fdf1ced3d5
      
https://github.com/Dolibarr/dolibarr/commit/c4be61c55cf506feb39021abb09561fdf1ced3d5
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-10-22 (Tue, 22 Oct 2019)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/cunits.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/product.lib.php
    M htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
    M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
    M htdocs/core/modules/reception/doc/pdf_squille.modules.php
    M htdocs/expedition/card.php
    M htdocs/product/canvas/product/actions_card_product.class.php
    M htdocs/product/card.php
    M htdocs/product/class/html.formproduct.class.php
    M htdocs/product/class/product.class.php
    M htdocs/reception/card.php
    M htdocs/variants/combinations.php
    M htdocs/variants/generator.php

  Log Message:
  -----------
  FIX Better compatible fix for the trouble of weight / size units

Conflicts:
        htdocs/core/class/html.form.class.php
        htdocs/product/card.php