[Dolibarr-git] [Dolibarr/dolibarr] 0c6aaa: FIX #5168

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0c6aaaaa3cbd159b82fc14aece10844ff9f0c8f4
      
https://github.com/Dolibarr/dolibarr/commit/0c6aaaaa3cbd159b82fc14aece10844ff9f0c8f4
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M htdocs/core/lib/functions2.lib.php

  Log Message:
  -----------
  FIX #5168


  Commit: 12cc1ad32634478deced4e93173f38e3a9de5130
      
https://github.com/Dolibarr/dolibarr/commit/12cc1ad32634478deced4e93173f38e3a9de5130
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    A htdocs/accountancy/admin/categories.php
    M htdocs/accountancy/admin/fiscalyear_card.php
    M htdocs/accountancy/class/accountancycategory.class.php
    M htdocs/admin/barcode.php
    M htdocs/comm/index.php
    M htdocs/commande/index.php
    M htdocs/compta/index.php
    M htdocs/core/modules/modAccounting.class.php
    M htdocs/expedition/card.php
    M htdocs/install/mysql/data/llx_10_c_regions.sql
    M htdocs/install/mysql/data/llx_20_c_departements.sql
    M htdocs/install/mysql/migration/3.9.0-4.0.0.sql
    A htdocs/install/mysql/tables/llx_accounting_journal.key.sql
    A htdocs/install/mysql/tables/llx_accounting_journal.sql
    M htdocs/langs/en_US/accountancy.lang

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/31ef42c55965...12cc1ad32634