[Dolibarr-git] [Dolibarr/dolibarr] 60321a: Fix regression

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 60321aabd89e38b77cfbf68cc4793b2970d5cb4d
      
https://github.com/Dolibarr/dolibarr/commit/60321aabd89e38b77cfbf68cc4793b2970d5cb4d
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

  Log Message:
  -----------
  Fix regression


  Commit: 0412264418e06dab0475044df0a88c8fbd6b2945
      
https://github.com/Dolibarr/dolibarr/commit/0412264418e06dab0475044df0a88c8fbd6b2945
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-30 (Wed, 30 May 2018)

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

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

Conflicts:
        htdocs/fourn/class/fournisseur.commande.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/37331691201d...0412264418e0
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.