[Dolibarr-git] [Dolibarr/dolibarr] a7c855: Accountancy: merge branch develop & 3.9 backported

[Laurent Destailleur]

  Branch: refs/heads/3.9_backported
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: a7c8554fe365669dea5b8093d450efa8e87ef734
      
https://github.com/Dolibarr/dolibarr/commit/a7c8554fe365669dea5b8093d450efa8e87ef734
  Author: aspangaro <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/balance.php
    A htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    A htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.sql

  Log Message:
  -----------
  Accountancy: merge branch develop & 3.9 backported


  Commit: 54963e5d0b05e15f3b73e516807bd2438ba21007
      
https://github.com/Dolibarr/dolibarr/commit/54963e5d0b05e15f3b73e516807bd2438ba21007
  Author: aspangaro <address@hidden>
  Date:   2016-04-05 (Tue, 05 Apr 2016)

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

  Log Message:
  -----------
  Update export with AccountancyExport::getType()


  Commit: 1160192ebb26e887062c0c72f029658e4040f85d
      
https://github.com/Dolibarr/dolibarr/commit/1160192ebb26e887062c0c72f029658e4040f85d
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-04-08 (Fri, 08 Apr 2016)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/card.php
    M htdocs/accountancy/admin/export.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/accountancy/bookkeeping/balance.php
    A htdocs/accountancy/class/accountancyexport.class.php
    M htdocs/accountancy/class/accountingaccount.class.php
    M htdocs/accountancy/class/bookkeeping.class.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/purchasesjournal.php
    A htdocs/core/class/html.formaccounting.class.php
    M htdocs/core/lib/accounting.lib.php
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_account.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.key.sql
    A htdocs/install/mysql/tables/llx_c_accounting_category.sql

  Log Message:
  -----------
  Merge pull request #4947 from aspangaro/3.9_backported2

Accountancy: merge branch develop & 3.9 backported


Compare: 
https://github.com/Dolibarr/dolibarr/compare/192623c58ca6...1160192ebb26