[Dolibarr-git] [Dolibarr/dolibarr] 1a9e98: Fix categories bug

[Laurent Destailleur]

  Branch: refs/heads/3.6
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
      
https://github.com/Dolibarr/dolibarr/commit/1a9e98cda9563b42f1f7e7d1faf215d165ff34bb
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Fix categories bug

When using the string type,
$typeid == 1 matched all strings making other conditions ineffective.


  Commit: 739d309a0d3e38becd20c28bf07e41078fcf49c7
      
https://github.com/Dolibarr/dolibarr/commit/739d309a0d3e38becd20c28bf07e41078fcf49c7
  Author: Raphaël Doursenaud <address@hidden>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Updated category fix

Categories ID can be passed as strings
PSR code formatting


  Commit: 67b308cb2549550777d76551800db94c4cf2b3d0
      
https://github.com/Dolibarr/dolibarr/commit/67b308cb2549550777d76551800db94c4cf2b3d0
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Fix: list event view lost type event filter


  Commit: 911aca399ddad5ecc9ebe7100eff5f89d31687f4
      
https://github.com/Dolibarr/dolibarr/commit/911aca399ddad5ecc9ebe7100eff5f89d31687f4
  Author: Florian HENRY <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php

  Log Message:
  -----------
  save code event


  Commit: 576512e339fe1c5caf16a57dbc9a0ed8355ea827
      
https://github.com/Dolibarr/dolibarr/commit/576512e339fe1c5caf16a57dbc9a0ed8355ea827
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M htdocs/categories/class/categorie.class.php

  Log Message:
  -----------
  Merge pull request #1815 from GPCsolutions/catbug

Fix categories bug


  Commit: 660557b4dd7cc64bc3dddb3e980978b6eab28921
      
https://github.com/Dolibarr/dolibarr/commit/660557b4dd7cc64bc3dddb3e980978b6eab28921
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/comm/action/listactions.php

  Log Message:
  -----------
  Merge pull request #1862 from FHenry/3.5

Fix: list event view lost type event filter


  Commit: 522b5a91bc8d9b7a87bbf2269384725b29d3202a
      
https://github.com/Dolibarr/dolibarr/commit/522b5a91bc8d9b7a87bbf2269384725b29d3202a
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M htdocs/compta/facture.php
    M htdocs/core/class/html.form.class.php
    M htdocs/fourn/facture/fiche.php

  Log Message:
  -----------
  Fix: Filter on direction of payment mode was not working.

Conflicts:
        htdocs/core/class/html.form.class.php
        htdocs/fourn/facture/fiche.php


  Commit: 31eb4bda8876b88ef6bf5e988d001eeba5994801
      
https://github.com/Dolibarr/dolibarr/commit/31eb4bda8876b88ef6bf5e988d001eeba5994801
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-09-06 (Sat, 06 Sep 2014)

  Changed paths:
    M ChangeLog
    M htdocs/categories/class/categorie.class.php

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

Conflicts:
        htdocs/categories/class/categorie.class.php
        htdocs/compta/facture.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2b9b110f9cbc...31eb4bda8876