[Dolibarr-git] [Dolibarr/dolibarr] 6f1c67: Fix: php 5.6 is ok now (travis)

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6f1c679d20fd1087ac6b6c37d2dff3b87b9d9209
      
https://github.com/Dolibarr/dolibarr/commit/6f1c679d20fd1087ac6b6c37d2dff3b87b9d9209
  Author: Regis Houssin <address@hidden>
  Date:   2017-07-16 (Sun, 16 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Fix: php 5.6 is ok now (travis)


  Commit: 4c84c97bb63841f593f2410bfa589c9556059609
      
https://github.com/Dolibarr/dolibarr/commit/4c84c97bb63841f593f2410bfa589c9556059609
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription


  Commit: c59059ad9d5f974de2c38e3cc8f18ab466bf5b43
      
https://github.com/Dolibarr/dolibarr/commit/c59059ad9d5f974de2c38e3cc8f18ab466bf5b43
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M .travis.yml

  Log Message:
  -----------
  Merge pull request #7167 from hregis/6.0_bug

Fix: php 5.6 is ok now (travis)


  Commit: 594f08cc6f4fdc5ac2d18bd2de66171f4dbe14e4
      
https://github.com/Dolibarr/dolibarr/commit/594f08cc6f4fdc5ac2d18bd2de66171f4dbe14e4
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M htdocs/adherents/subscription.php

  Log Message:
  -----------
  Merge pull request #7170 from aspangaro/6.0-fix7169

Fix #7169 : Unknown column 'ba.accountancy_journal' in member's subcription


  Commit: 6665416d97cf5efe65a68fd77230a43c031df8ac
      
https://github.com/Dolibarr/dolibarr/commit/6665416d97cf5efe65a68fd77230a43c031df8ac
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M .travis.yml
    M htdocs/adherents/subscription.php

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


  Commit: 1bc2bba953b6c82011c860dbcae39df9278acc69
      
https://github.com/Dolibarr/dolibarr/commit/1bc2bba953b6c82011c860dbcae39df9278acc69
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-18 (Tue, 18 Jul 2017)

  Changed paths:
    M htdocs/commande/card.php
    M htdocs/compta/index.php
    M htdocs/core/modules/modProduct.class.php
    M htdocs/core/modules/modService.class.php
    M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
    M htdocs/product/list.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/782cde37b30b...1bc2bba953b6