[Dolibarr-git] [Dolibarr/dolibarr] b276a8: Fix sql entity for sub query

[Laurent Destailleur]

  Branch: refs/heads/7.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: b276a8186e8bf0b9b2b556ea2268664c31d1df5a
      
https://github.com/Dolibarr/dolibarr/commit/b276a8186e8bf0b9b2b556ea2268664c31d1df5a
  Author: John <address@hidden>
  Date:   2018-02-21 (Wed, 21 Feb 2018)

  Changed paths:
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql

  Log Message:
  -----------
  Fix sql entity for sub query


  Commit: 1d6baf5f2bd69806314a82b9bdb449cad92fba36
      
https://github.com/Dolibarr/dolibarr/commit/1d6baf5f2bd69806314a82b9bdb449cad92fba36
  Author: Juanjo Menent <address@hidden>
  Date:   2018-02-22 (Thu, 22 Feb 2018)

  Changed paths:
    M htdocs/core/class/html.formactions.class.php

  Log Message:
  -----------
  Fix: Not showing link to ad event if module is disabled


  Commit: 36cc1c6ca95feb4111cff39d09e45012d1807c64
      
https://github.com/Dolibarr/dolibarr/commit/36cc1c6ca95feb4111cff39d09e45012d1807c64
  Author: Marc de Lima Lucio <address@hidden>
  Date:   2018-02-23 (Fri, 23 Feb 2018)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  FIX: solve column mismatch in user card's usergroup list + code cleanup


  Commit: b20ae45265b522589c709ff7ea62b6f14239f7d6
      
https://github.com/Dolibarr/dolibarr/commit/b20ae45265b522589c709ff7ea62b6f14239f7d6
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql

  Log Message:
  -----------
  Merge pull request #8210 from atm-john/fix_sql_entity

Fix sql entity for sub query


  Commit: c698558d9e1406d4c87d0bdc13a4de925b627ac9
      
https://github.com/Dolibarr/dolibarr/commit/c698558d9e1406d4c87d0bdc13a4de925b627ac9
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/core/class/html.formactions.class.php

  Log Message:
  -----------
  Merge pull request #8212 from simnandez/6.0

Fix: Not showing link to ad event if module is disabled


  Commit: 7b448a2d18b0e2b78b614642cc979aa59842ad28
      
https://github.com/Dolibarr/dolibarr/commit/7b448a2d18b0e2b78b614642cc979aa59842ad28
  Author: Rui Strecht <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Fixed issue with elementarray null if num_rows = 0


  Commit: 286d62edb841c0e4a2a2d5e57c2c6bb59143f37e
      
https://github.com/Dolibarr/dolibarr/commit/286d62edb841c0e4a2a2d5e57c2c6bb59143f37e
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/user/card.php

  Log Message:
  -----------
  Merge pull request #8221 from ATM-Marc/FIX_usercard_columns

FIX: solve column mismatch in user card with multicompany transverse mode + 
code cleanup


  Commit: 8dceb8930f46b435951b8c649506363e844c1137
      
https://github.com/Dolibarr/dolibarr/commit/8dceb8930f46b435951b8c649506363e844c1137
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-02-25 (Sun, 25 Feb 2018)

  Changed paths:
    M htdocs/core/class/html.formactions.class.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/user/card.php

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

Conflicts:
        htdocs/core/class/html.formactions.class.php
        htdocs/user/card.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6a78ce65e9c0...8dceb8930f46