[Dolibarr-git] [Dolibarr/dolibarr] 7556a6: fix travis

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 7556a604e364a6d4cb3d5517605170012277bf84
      
https://github.com/Dolibarr/dolibarr/commit/7556a604e364a6d4cb3d5517605170012277bf84
  Author: florian HENRY <address@hidden>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

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

  Log Message:
  -----------
  fix travis


  Commit: 7f869b484072c80fa56a135418efe9b1cd00cf3c
      
https://github.com/Dolibarr/dolibarr/commit/7f869b484072c80fa56a135418efe9b1cd00cf3c
  Author: florian HENRY <address@hidden>
  Date:   2017-07-03 (Mon, 03 Jul 2017)

  Changed paths:
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/bookkeeping/balance.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/customer/index.php
    M htdocs/accountancy/expensereport/index.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/report/result.php
    M htdocs/accountancy/supplier/index.php
    M htdocs/admin/menus/index.php
    M htdocs/admin/websites.php
    M htdocs/collab/index.php
    M htdocs/comm/propal/card.php
    M htdocs/comm/propal/class/propal.class.php
    M htdocs/comm/propal/contact.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/info.php
    M htdocs/comm/propal/list.php
    M htdocs/comm/propal/note.php
    M htdocs/commande/card.php
    M htdocs/commande/class/commande.class.php
    M htdocs/commande/contact.php
    M htdocs/commande/document.php
    M htdocs/commande/info.php
    M htdocs/commande/list.php
    M htdocs/commande/note.php
    M htdocs/compta/bank/transfer.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/salaries/info.php
    M htdocs/compta/stats/casoc.php
    M htdocs/contrat/card.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/treeview.lib.php
    M htdocs/core/lib/website.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/modWebsites.class.php
    M htdocs/core/modules/syslog/mod_syslog_file.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/migration/repair.sql
    M htdocs/install/mysql/tables/llx_product_attribute.key.sql
    M htdocs/install/repair.php
    M htdocs/install/step1.php
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/modulebuilder.lang
    M htdocs/langs/en_US/stocks.lang
    M htdocs/langs/en_US/website.lang
    M htdocs/loan/card.php
    M htdocs/main.inc.php
    M htdocs/master.inc.php
    M htdocs/modulebuilder/index.php
    M htdocs/public/error-404.php
    M htdocs/public/stripe/newpayment.php
    A htdocs/public/test/test_sessionlock.php
    M htdocs/public/websites/index.php
    M htdocs/public/websites/styles.css.php
    M htdocs/societe/agenda.php
    M htdocs/societe/card.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/commerciaux.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/societe/note.php
    M htdocs/societe/notify/card.php
    M htdocs/societe/project.php
    M htdocs/societe/rib.php
    M htdocs/societe/societecontact.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M htdocs/websites/class/websitepage.class.php
    M htdocs/websites/index.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
        htdocs/accountancy/class/accountancycategory.class.php


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

  Changed paths:
    M htdocs/adherents/stats/byproperties.php
    M htdocs/adherents/stats/geo.php
    M htdocs/admin/agenda_xcal.php
    M htdocs/categories/admin/categorie.php
    M htdocs/categories/admin/categorie_extrafields.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/class/actioncomm.class.php
    M htdocs/core/db/mysqli.class.php
    M htdocs/core/db/pgsql.class.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/products.lang
    M htdocs/opensurvey/list.php
    M htdocs/product/admin/dynamic_prices.php
    M htdocs/product/dynamic_price/class/price_global_variable_updater.class.php
    M htdocs/public/agenda/agendaexport.php
    M htdocs/resource/list.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


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

  Changed paths:
    M htdocs/ecm/class/ecmfiles.class.php
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  fix class error


  Commit: 1c647e289862bc72f3715e802f00c8db32f1a56d
      
https://github.com/Dolibarr/dolibarr/commit/1c647e289862bc72f3715e802f00c8db32f1a56d
  Author: florian HENRY <address@hidden>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M htdocs/admin/agenda_other.php
    M htdocs/api/index.php
    M htdocs/categories/class/categorie.class.php
    M htdocs/comm/action/listactions.php
    M htdocs/commande/class/commande.class.php
    M htdocs/compta/facture/class/facture-rec.class.php
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
    M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
    M htdocs/core/modules/propale/doc/pdf_azur.modules.php
    M htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
    M htdocs/fourn/class/fournisseur.commande.class.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/langs/en_US/agenda.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/product/price.php
    M htdocs/societe/class/societe.class.php
    M htdocs/societe/price.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M test/phpunit/FunctionsLibTest.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop


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

  Changed paths:
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/compta/bank/transfer.php
    M htdocs/ecm/class/ecmfiles.class.php
    M htdocs/modulebuilder/template/class/myobject.class.php

  Log Message:
  -----------
  Merge pull request #7084 from atm-florian/develop

FIX Transfer between account with different currencies


Compare: 
https://github.com/Dolibarr/dolibarr/compare/640f66f01751...451508ba20de