[Dolibarr-git] [Dolibarr/dolibarr] 836054: BugFix Issue #8261: Variants module. Combinations ...

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 836054a8b3eb67b776a79daafd475c470b1ff0aa
      
https://github.com/Dolibarr/dolibarr/commit/836054a8b3eb67b776a79daafd475c470b1ff0aa
  Author: BadPixxel <address@hidden>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M htdocs/variants/combinations.php

  Log Message:
  -----------
  BugFix Issue #8261: Variants module. Combinations cannot be edited


  Commit: 44d18027f2bd4c882b711144cc229c9c4502b676
      
https://github.com/Dolibarr/dolibarr/commit/44d18027f2bd4c882b711144cc229c9c4502b676
  Author: BadPixxel <address@hidden>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

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

  Log Message:
  -----------
  BugFix for PHP7.1: PHP Warning:  A non-numeric value encountered in 
/tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709


  Commit: 6c9e0e1752c948790798121937558705b9234703
      
https://github.com/Dolibarr/dolibarr/commit/6c9e0e1752c948790798121937558705b9234703
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

  Changed paths:
    M htdocs/core/actions_addupdatedelete.inc.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/expensereport/card.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/expensereport/note.php
    M htdocs/product/class/product.class.php
    M htdocs/product/inventory/card.php
    M htdocs/product/inventory/list.php

  Log Message:
  -----------
  Merge branch '7.0' into 7.0


  Commit: 0b1b740a0e8de5f8eac194246702016f8a51020f
      
https://github.com/Dolibarr/dolibarr/commit/0b1b740a0e8de5f8eac194246702016f8a51020f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-03-10 (Sat, 10 Mar 2018)

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

  Log Message:
  -----------
  Merge pull request #8329 from BadPixxel/7.0

BugFix Issue #8261: Variants module. Combinations cannot be edited


Compare: 
https://github.com/Dolibarr/dolibarr/compare/74dc815bfa0e...0b1b740a0e8d