[Dolibarr-git] [Dolibarr/dolibarr] c84f44: fix accountanty in multientity

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: c84f44a508d2a1a5b60c5468fe18c3340b506a19
      
https://github.com/Dolibarr/dolibarr/commit/c84f44a508d2a1a5b60c5468fe18c3340b506a19
  Author: florian HENRY <address@hidden>
  Date:   2018-05-01 (Tue, 01 May 2018)

  Changed paths:
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_journal.key.sql
    M htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
    M htdocs/install/mysql/tables/llx_c_accounting_category.sql

  Log Message:
  -----------
  fix accountanty in multientity


  Commit: daf829c9f7a8610402a28a027d4d2e06e7c06f1e
      
https://github.com/Dolibarr/dolibarr/commit/daf829c9f7a8610402a28a027d4d2e06e7c06f1e
  Author: florian HENRY <address@hidden>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M htdocs/accountancy/admin/accountmodel.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/security.php
    M htdocs/core/class/menubase.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/modDav.class.php
    M htdocs/core/modules/modMultiCurrency.class.php
    M htdocs/core/modules/modResource.class.php
    M htdocs/core/modules/modTicketsup.class.php
    M htdocs/cron/list.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/societe/card.php

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

Conflicts:
        htdocs/install/mysql/migration/7.0.0-8.0.0.sql


  Commit: 123a93e6e37261e235e28737f704de4244a2857e
      
https://github.com/Dolibarr/dolibarr/commit/123a93e6e37261e235e28737f704de4244a2857e
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_journal.key.sql
    M htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
    M htdocs/install/mysql/tables/llx_c_accounting_category.sql

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

FIX Compatibility of accountanty module with multicompany module


Compare: 
https://github.com/Dolibarr/dolibarr/compare/0310db7e15f9...123a93e6e372
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.