[Dolibarr-git] [Dolibarr/dolibarr] cc37a7: Fix parenthesis

[Laurent Destailleur]

  Branch: refs/heads/5.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: cc37a7d84823b6db24ae6a09d53451ec0c841a35
      
https://github.com/Dolibarr/dolibarr/commit/cc37a7d84823b6db24ae6a09d53451ec0c841a35
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-09 (Fri, 09 Jun 2017)

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

  Log Message:
  -----------
  Fix parenthesis


  Commit: d037515e37938161982583d866c598fc03061c9d
      
https://github.com/Dolibarr/dolibarr/commit/d037515e37938161982583d866c598fc03061c9d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M htdocs/core/lib/functions.lib.php
    M htdocs/user/index.php

  Log Message:
  -----------
  FIX SQL injection on user/index.php parameter search_statut.

Conflicts:
        htdocs/user/index.php


  Commit: 9c482b9f2a021604e29b7321e2e18eed60d08932
      
https://github.com/Dolibarr/dolibarr/commit/9c482b9f2a021604e29b7321e2e18eed60d08932
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-10 (Sat, 10 Jun 2017)

  Changed paths:
    M htdocs/core/datepicker.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/search_page.php
    M htdocs/externalsite/frames.php
    M htdocs/install/inc.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php

  Log Message:
  -----------
  FIX CVE-2017-7886


  Commit: 83a5b8e078ba57ba3d4070e5f3f2cb944c28e555
      
https://github.com/Dolibarr/dolibarr/commit/83a5b8e078ba57ba3d4070e5f3f2cb944c28e555
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/fourn/commande/card.php

  Log Message:
  -----------
  FIX Can set supplier invoice to billed.


  Commit: 7939daa2256170116ce90c29d6d4a9c46f2b0377
      
https://github.com/Dolibarr/dolibarr/commit/7939daa2256170116ce90c29d6d4a9c46f2b0377
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-14 (Wed, 14 Jun 2017)

  Changed paths:
    M htdocs/core/datepicker.php
    M htdocs/core/get_menudiv.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/search_page.php
    M htdocs/externalsite/frames.php
    M htdocs/fourn/commande/card.php
    M htdocs/install/inc.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/support/inc.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/user/index.php

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

Conflicts:
        htdocs/core/lib/functions.lib.php
        htdocs/theme/eldy/style.css.php
        htdocs/theme/md/style.css.php
        htdocs/user/index.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fd2ab6371d1f...7939daa22561