[Dolibarr-git] [Dolibarr/dolibarr] d992d5: Fix: Bad SQL request when using filter on category...

[Laurent Destailleur]

  Branch: refs/heads/3.5
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: d992d5cb228c0976ba3c9f5283fb2f81115172bb
      
https://github.com/Dolibarr/dolibarr/commit/d992d5cb228c0976ba3c9f5283fb2f81115172bb
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php

  Log Message:
  -----------
  Fix: Bad SQL request when using filter on category.


  Commit: 8d664973841fde293011104f174f33a7025e351c
      
https://github.com/Dolibarr/dolibarr/commit/8d664973841fde293011104f174f33a7025e351c
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Update doc for 3.4.2


  Commit: f0503dfaa951dcb52af609d88ca8922f88e75a67
      
https://github.com/Dolibarr/dolibarr/commit/f0503dfaa951dcb52af609d88ca8922f88e75a67
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-01-03 (Fri, 03 Jan 2014)

  Changed paths:
    M ChangeLog
    M htdocs/compta/stats/cabyprodserv.php
    M htdocs/compta/stats/casoc.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3.4' into 3.5

Conflicts:
        ChangeLog
        htdocs/compta/stats/cabyprodserv.php
        htdocs/compta/stats/casoc.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/601b2744e05c...f0503dfaa951