[Dolibarr-git] [Dolibarr/dolibarr] 403116: Fix cherry-pick

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 403116898fab7ee3fa05b9c43693828d475cc359
      
https://github.com/Dolibarr/dolibarr/commit/403116898fab7ee3fa05b9c43693828d475cc359
  Author: bgenere <address@hidden>
  Date:   2018-06-19 (Tue, 19 Jun 2018)

  Log Message:
  -----------
  Fix cherry-pick


  Commit: 9f2437fa0482534b1222e075da06717840606d79
      
https://github.com/Dolibarr/dolibarr/commit/9f2437fa0482534b1222e075da06717840606d79
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

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

  Log Message:
  -----------
  Fix missing field


  Commit: 714057d435d6ef8e1fec80a54f73bd3c7077efc7
      
https://github.com/Dolibarr/dolibarr/commit/714057d435d6ef8e1fec80a54f73bd3c7077efc7
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M htdocs/projet/class/projectstats.class.php

  Log Message:
  -----------
  Fix stats on project. Must use assignement on project as filter.


  Commit: 07c514b85c09c6693f03cbbaae572d3e7be3864b
      
https://github.com/Dolibarr/dolibarr/commit/07c514b85c09c6693f03cbbaae572d3e7be3864b
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-20 (Wed, 20 Jun 2018)

  Changed paths:
    M htdocs/fourn/class/fournisseur.product.class.php
    M htdocs/projet/class/projectstats.class.php

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

Conflicts:
        htdocs/fourn/class/fournisseur.product.class.php
        htdocs/projet/class/projectstats.class.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/828a9296b4aa...07c514b85c09
      **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.