[Dolibarr-git] [Dolibarr/dolibarr] 15e1c5: Merge pull request #1 from Dolibarr/develop

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 15e1c5d1ada8b25b3658499e9acaaed09d880850
      
https://github.com/Dolibarr/dolibarr/commit/15e1c5d1ada8b25b3658499e9acaaed09d880850
  Author: Conspir3D <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php

  Log Message:
  -----------
  Merge pull request #1 from Dolibarr/develop

Fix status was not refreshed


  Commit: d01a8d0508ff4782dcae98ac897f5dc552d7bbd1
      
https://github.com/Dolibarr/dolibarr/commit/d01a8d0508ff4782dcae98ac897f5dc552d7bbd1
  Author: Jan Giebels <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M htdocs/comm/index.php

  Log Message:
  -----------
  Added order status =1 or =2 for overview


  Commit: 9642206bd12a0c39da7b031a6d805958e7eb8e62
      
https://github.com/Dolibarr/dolibarr/commit/9642206bd12a0c39da7b031a6d805958e7eb8e62
  Author: Jan Giebels <address@hidden>
  Date:   2018-01-19 (Fri, 19 Jan 2018)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  Fix label generation for fichinter card generation from order. Labels get 
concatenated.


  Commit: fa30804364d28449db15840ede9edd2e2aae5d4f
      
https://github.com/Dolibarr/dolibarr/commit/fa30804364d28449db15840ede9edd2e2aae5d4f
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-01-20 (Sat, 20 Jan 2018)

  Changed paths:
    M htdocs/comm/index.php
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  Merge pull request #8075 from Conspir3D/develop

Added order status =1 or =2 for overview of orders


Compare: 
https://github.com/Dolibarr/dolibarr/compare/80b2b7d8f27f...fa30804364d2