[Dolibarr-git] [Dolibarr/dolibarr] 8f2786: fix:this is not accessible in static context

[Je2fb]

  Branch: refs/heads/10.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 8f2786cf7b9fa87820d385a693a7dfa7bf2ed0ab
      
https://github.com/Dolibarr/dolibarr/commit/8f2786cf7b9fa87820d385a693a7dfa7bf2ed0ab
  Author: Abbes Bahfir <address@hidden>
  Date:   2019-08-10 (Sat, 10 Aug 2019)

  Changed paths:
    M htdocs/debugbar/class/TraceableDB.php

  Log Message:
  -----------
  fix:this is not accessible in static context


  Commit: f752b96a7e96fb87092f3c080c05a5e61c640e1a
      
https://github.com/Dolibarr/dolibarr/commit/f752b96a7e96fb87092f3c080c05a5e61c640e1a
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-08-10 (Sat, 10 Aug 2019)

  Changed paths:
    M htdocs/product/admin/product.php
    M htdocs/product/card.php

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


  Commit: 2dee289fc6eda76e05cc185583f02b1578b4ed35
      
https://github.com/Dolibarr/dolibarr/commit/2dee289fc6eda76e05cc185583f02b1578b4ed35
  Author: Je2fb <address@hidden>
  Date:   2019-08-10 (Sat, 10 Aug 2019)

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

  Log Message:
  -----------
  Update price_parser.class.php

Calculation with supplier_min_price work

Conflicts:
        htdocs/product/dynamic_price/class/price_parser.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/88c66d24fe72...2dee289fc6ed