[Dolibarr-git] [Dolibarr/dolibarr] f57181: FIX : 7213

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f5718106a66d6497c9f8357caccc9534a35d9329
      
https://github.com/Dolibarr/dolibarr/commit/f5718106a66d6497c9f8357caccc9534a35d9329
  Author: florian HENRY <address@hidden>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M htdocs/variants/class/ProductCombination.class.php
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  FIX : 7213


  Commit: 4f0b35874dc925f390c42c3f2e1f7581c72d7b3f
      
https://github.com/Dolibarr/dolibarr/commit/4f0b35874dc925f390c42c3f2e1f7581c72d7b3f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-31 (Mon, 31 Jul 2017)

  Changed paths:
    M htdocs/variants/class/ProductCombination.class.php
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  Merge pull request #7216 from atm-florian/fix_7213

FIX : #7213


Compare: 
https://github.com/Dolibarr/dolibarr/compare/b0adc9cca48f...4f0b35874dc9