[Dolibarr-git] [Dolibarr/dolibarr] c52e59: Fix this->db

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c52e593ea85c5afda0989515b1440d7dc16ce1c8
      
https://github.com/Dolibarr/dolibarr/commit/c52e593ea85c5afda0989515b1440d7dc16ce1c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/class/html.form.class.php

  Log Message:
  -----------
  Fix this->db


  Commit: affaec2a6fa408aa898c48275330e6e29b46e1c8
      
https://github.com/Dolibarr/dolibarr/commit/affaec2a6fa408aa898c48275330e6e29b46e1c8
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

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

  Log Message:
  -----------
  Fix count into loop


  Commit: 3b40c95107afb26d9867f2fc611c39ebc64e8a14
      
https://github.com/Dolibarr/dolibarr/commit/3b40c95107afb26d9867f2fc611c39ebc64e8a14
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/core/class/html.form.class.php

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

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/24cd407cd3b5...3b40c95107af