[Dolibarr-git] [Dolibarr/dolibarr] 1af1e4: Accountancy - Add loan module in step to configure...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 1af1e4dc9c52c898643d041f817b1a57e74f6d62
      
https://github.com/Dolibarr/dolibarr/commit/1af1e4dc9c52c898643d041f817b1a57e74f6d62
  Author: aspangaro <address@hidden>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M htdocs/accountancy/index.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Accountancy - Add loan module in step to configure the accountancy


  Commit: 53c86496295c3e814701208c66832bd7f72de90e
      
https://github.com/Dolibarr/dolibarr/commit/53c86496295c3e814701208c66832bd7f72de90e
  Author: aspangaro <address@hidden>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M htdocs/accountancy/admin/account.php
    M htdocs/accountancy/admin/defaultaccounts.php
    M htdocs/accountancy/admin/index.php
    M htdocs/accountancy/bookkeeping/list.php
    M htdocs/accountancy/customer/lines.php
    M htdocs/accountancy/index.php
    M htdocs/accountancy/journal/purchasesjournal.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/accountancy/supplier/list.php
    M htdocs/compta/bank/index.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    A htdocs/install/mysql/tables/llx_accounting_bookkeeping.key.sql
    M htdocs/langs/en_US/accountancy.lang
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/salaries.lang
    M htdocs/langs/fr_FR/accountancy.lang
    M htdocs/langs/fr_FR/admin.lang
    M htdocs/projet/card.php
    M htdocs/projet/class/project.class.php

  Log Message:
  -----------
  Merge remote-tracking branch 'Upstream/develop' into 5.0-p22

Conflicts:
        htdocs/langs/en_US/accountancy.lang


  Commit: 60ba6164e4df915e6c1a6262407478779b20ffa7
      
https://github.com/Dolibarr/dolibarr/commit/60ba6164e4df915e6c1a6262407478779b20ffa7
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-10-24 (Mon, 24 Oct 2016)

  Changed paths:
    M htdocs/accountancy/index.php
    M htdocs/langs/en_US/accountancy.lang

  Log Message:
  -----------
  Merge pull request #5883 from aspangaro/5.0-p22

Accountancy - Add loan module in step to configure the accountancy


Compare: 
https://github.com/Dolibarr/dolibarr/compare/399d69134019...60ba6164e4df