[Dolibarr-git] [Dolibarr/dolibarr] 7f28c9: FIX #7824

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7f28c9fff6119b72e52fcd365ccd69aad7a1bd0c
      
https://github.com/Dolibarr/dolibarr/commit/7f28c9fff6119b72e52fcd365ccd69aad7a1bd0c
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M htdocs/product/stock/replenishorders.php

  Log Message:
  -----------
  FIX #7824

Conflicts:
        htdocs/product/stock/replenishorders.php


  Commit: fde33594a2c0b87e756cbcc34ce1d02ea2265f53
      
https://github.com/Dolibarr/dolibarr/commit/fde33594a2c0b87e756cbcc34ce1d02ea2265f53
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M htdocs/product/stock/replenishorders.php

  Log Message:
  -----------
  FIX #7824


  Commit: 42b7d805675ad3ea3e34664c55b93d4b11be057f
      
https://github.com/Dolibarr/dolibarr/commit/42b7d805675ad3ea3e34664c55b93d4b11be057f
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M htdocs/product/stock/replenishorders.php

  Log Message:
  -----------
  FIX #7824

Conflicts:
        htdocs/product/stock/replenishorders.php


  Commit: c3c14277e146f11c0db0e5e5451dbf774f00c718
      
https://github.com/Dolibarr/dolibarr/commit/c3c14277e146f11c0db0e5e5451dbf774f00c718
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Log Message:
  -----------
  Merge


  Commit: a6e4e4ddb0257360b7268edeb303c6506c527ed9
      
https://github.com/Dolibarr/dolibarr/commit/a6e4e4ddb0257360b7268edeb303c6506c527ed9
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M htdocs/product/stock/replenishorders.php

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

Conflicts:
        htdocs/product/stock/replenishorders.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/57a6ada2a35b...a6e4e4ddb025