[Dolibarr-git] [Dolibarr/dolibarr] 579525: New Can define nb of categories and products for p...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 579525ec48ad2bc1629d81af1e76987449e95d8f
      
https://github.com/Dolibarr/dolibarr/commit/579525ec48ad2bc1629d81af1e76987449e95d8f
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-27 (Wed, 27 Mar 2019)

  Changed paths:
    M htdocs/takepos/takepos.php

  Log Message:
  -----------
  New Can define nb of categories and products for pagination on TakePOS


  Commit: 0dc8082179ee315dade13a591ca62c0993072d7e
      
https://github.com/Dolibarr/dolibarr/commit/0dc8082179ee315dade13a591ca62c0993072d7e
  Author: Laurent Destailleur <address@hidden>
  Date:   2019-03-27 (Wed, 27 Mar 2019)

  Changed paths:

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

Conflicts:
        htdocs/takepos/takepos.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/3592283fc977...0dc8082179ee