[Dolibarr-git] [Dolibarr/dolibarr] 7f44fa: correct merge

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7f44faf0bef218587e35a7be28df3d75810d0e5a
      
https://github.com/Dolibarr/dolibarr/commit/7f44faf0bef218587e35a7be28df3d75810d0e5a
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M htdocs/accountancy/admin/export.php

  Log Message:
  -----------
  correct merge


  Commit: d39804e7b50aa68cb1152ba479a0cdc2a63a254c
      
https://github.com/Dolibarr/dolibarr/commit/d39804e7b50aa68cb1152ba479a0cdc2a63a254c
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M ChangeLog
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/transfer.php
    M htdocs/core/actions_linkedfiles.inc.php
    M htdocs/core/class/utils.class.php
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/cron/class/cronjob.class.php
    M htdocs/fichinter/class/fichinter.class.php
    M htdocs/product/list.php
    M test/phpunit/AllTests.php
    A test/phpunit/UtilsTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/develop' into exportadmin


  Commit: 45afbae49ca0d53f9d9de2613e8ab8b05c4b75e7
      
https://github.com/Dolibarr/dolibarr/commit/45afbae49ca0d53f9d9de2613e8ab8b05c4b75e7
  Author: Frédéric FRANCE <address@hidden>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M htdocs/accountancy/class/accountancyexport.class.php

  Log Message:
  -----------
  some change


  Commit: 6608dd72bd6abf729f166616dd0d2b5fbdb387ba
      
https://github.com/Dolibarr/dolibarr/commit/6608dd72bd6abf729f166616dd0d2b5fbdb387ba
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/class/accountancyexport.class.php

  Log Message:
  -----------
  Merge pull request #7776 from frederic34/exportadmin

correct merge


Compare: 
https://github.com/Dolibarr/dolibarr/compare/d1860b87f822...6608dd72bd6a