[Dolibarr-git] [Dolibarr/dolibarr] c85bf1: Fix AdvtargetEmailing

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c85bf18f0e20042739366d6d5df58a8a866ab292
      
https://github.com/Dolibarr/dolibarr/commit/c85bf18f0e20042739366d6d5df58a8a866ab292
  Author: florian HENRY <address@hidden>
  Date:   2017-07-11 (Tue, 11 Jul 2017)

  Changed paths:
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_mailing_cibles.sql

  Log Message:
  -----------
  Fix AdvtargetEmailing


  Commit: 379a5b9e1694e8a5fee2153cd6641d6f82f7ce5a
      
https://github.com/Dolibarr/dolibarr/commit/379a5b9e1694e8a5fee2153cd6641d6f82f7ce5a
  Author: florian HENRY <address@hidden>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

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

  Log Message:
  -----------
  fix : SQL migration in capital letters


  Commit: 67664331e33600cb4298e9574f3696855fc997c6
      
https://github.com/Dolibarr/dolibarr/commit/67664331e33600cb4298e9574f3696855fc997c6
  Author: florian HENRY <address@hidden>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

  Changed paths:
    M htdocs/admin/notification.php
    M htdocs/admin/websites.php
    M htdocs/bookmarks/bookmarks.lib.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/listactions.php
    M htdocs/contact/card.php
    M htdocs/core/actions_setmoduleoptions.inc.php
    M htdocs/core/class/menubase.class.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    A htdocs/install/mysql/tables/llx_website_page.key.sql
    A htdocs/install/mysql/tables/llx_website_page.sql
    R htdocs/install/mysql/tables/llx_website_pages.key.sql
    R htdocs/install/mysql/tables/llx_website_pages.sql
    M htdocs/install/step1.php
    M htdocs/langs/en_US/modulebuilder.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/main.inc.php
    M htdocs/modulebuilder/index.php
    M htdocs/modulebuilder/template/class/myobject.class.php
    M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/projet/activity/perday.php
    M htdocs/societe/price.php
    M htdocs/theme/eldy/ckeditor/config.js
    M htdocs/theme/md/ckeditor/config.js
    M htdocs/websites/class/websitepage.class.php
    M htdocs/websites/index.php
    M test/phpunit/RestAPIDocumentTest.php

  Log Message:
  -----------
  Merge branch '6.0' of local repository into 6.0_fix_advtargetmailing


  Commit: 816283d1e56286dc748e8883e0a000d5b18ea3b9
      
https://github.com/Dolibarr/dolibarr/commit/816283d1e56286dc748e8883e0a000d5b18ea3b9
  Author: florian HENRY <address@hidden>
  Date:   2017-07-12 (Wed, 12 Jul 2017)

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

  Log Message:
  -----------
  fix SQL


  Commit: 10337b4914aec0f2becdeb6ab30a2fdb9da64ad5
      
https://github.com/Dolibarr/dolibarr/commit/10337b4914aec0f2becdeb6ab30a2fdb9da64ad5
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M htdocs/install/mysql/tables/llx_mailing_cibles.sql

  Log Message:
  -----------
  Update llx_mailing_cibles.sql


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

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

  Log Message:
  -----------
  Update 5.0.0-6.0.0.sql


  Commit: 58ce8eaf462002fc7e4ac029984b8d65d3c565f1
      
https://github.com/Dolibarr/dolibarr/commit/58ce8eaf462002fc7e4ac029984b8d65d3c565f1
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-07-13 (Thu, 13 Jul 2017)

  Changed paths:
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/class/advtargetemailing.class.php
    M htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_mailing_cibles.sql

  Log Message:
  -----------
  Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing

Fix AdvtargetEmailing


Compare: 
https://github.com/Dolibarr/dolibarr/compare/fb0298ff1c4b...58ce8eaf4620