[Dolibarr-git] [Dolibarr/dolibarr] 90c1a3: Accountancy - Activate multijournal on bank_journa...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 90c1a3848698c6bec7203d7e6e4905fb81ef747a
      
https://github.com/Dolibarr/dolibarr/commit/90c1a3848698c6bec7203d7e6e4905fb81ef747a
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/install/mysql/tables/llx_accounting_journal.sql

  Log Message:
  -----------
  Accountancy - Activate multijournal on bank_journal


  Commit: ef9275d03174726aad9c50e56601c13bc214cd14
      
https://github.com/Dolibarr/dolibarr/commit/ef9275d03174726aad9c50e56601c13bc214cd14
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M ChangeLog
    M build/debian/README.howto
    M build/debian/source/lintian-overrides
    M htdocs/admin/agenda_other.php
    M htdocs/admin/barcode.php
    M htdocs/admin/chequereceipts.php
    M htdocs/admin/commande.php
    M htdocs/admin/contract.php
    M htdocs/admin/expedition.php
    M htdocs/admin/expensereport.php
    M htdocs/admin/facture.php
    M htdocs/admin/fichinter.php
    M htdocs/admin/livraison.php
    M htdocs/admin/payment.php
    M htdocs/admin/propal.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplier_payment.php
    M htdocs/admin/supplier_proposal.php
    M htdocs/admin/user.php
    M htdocs/admin/usergroup.php
    M htdocs/comm/action/card.php
    M htdocs/compta/facture/class/facture.class.php
    M htdocs/compta/prelevement/class/bonprelevement.class.php
    M htdocs/contrat/class/contrat.class.php
    M htdocs/core/actions_massactions.inc.php
    A htdocs/core/actions_setmoduleoptions.inc.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/hookmanager.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formcompany.class.php
    M htdocs/core/class/html.formprojet.class.php
    M htdocs/core/class/interfaces.class.php
    M htdocs/core/js/timesheet.js
    M htdocs/core/lib/files.lib.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/core/lib/project.lib.php
    M htdocs/core/lib/security.lib.php
    M htdocs/core/menus/init_menu_auguria.sql
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/DolibarrModules.class.php
    M htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/don/admin/donation.php
    M htdocs/filefunc.inc.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_advtargetemailing.sql
    A htdocs/install/mysql/tables/llx_loan_schedule.sql
    M htdocs/install/mysql/tables/llx_product_attribute.sql
    M htdocs/install/mysql/tables/llx_product_attribute_combination.sql
    M htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
    M htdocs/install/mysql/tables/llx_product_attribute_value.sql
    M htdocs/install/mysql/tables/llx_product_pricerules.sql
    M htdocs/install/upgrade2.php
    M htdocs/langs/en_US/admin.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/loan.lang
    M htdocs/langs/en_US/projects.lang
    A htdocs/loan/calcmens.php
    M htdocs/loan/card.php
    A htdocs/loan/class/loanschedule.class.php
    A htdocs/loan/createschedule.php
    M htdocs/modulebuilder/template/admin/setup.php
    M htdocs/modulebuilder/template/class/actions_mymodule.class.php
    A htdocs/modulebuilder/template/img/object_mytest.png
    M htdocs/modulebuilder/template/langs/en_US/mymodule.lang
    M htdocs/modulebuilder/template/langs/fr_FR/mymodule.lang
    M htdocs/product/admin/product.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/projet/admin/project.php
    M htdocs/projet/card.php
    M htdocs/projet/class/api_projects.class.php
    M htdocs/projet/class/projectstats.class.php
    A htdocs/projet/class/taskstats.class.php
    M htdocs/projet/tasks/list.php
    A htdocs/projet/tasks/stats/index.php
    A htdocs/public/onlinesign/newonlinesign.php
    M htdocs/public/paybox/newpayment.php
    M htdocs/public/payment/newpayment.php
    M htdocs/public/paypal/newpayment.php
    M htdocs/public/stripe/newpayment.php
    M htdocs/societe/admin/societe.php
    M htdocs/supplier_proposal/class/supplier_proposal.class.php
    M htdocs/theme/eldy/style.css.php
    M htdocs/theme/md/style.css.php
    M test/phpunit/CodingSqlTest.php
    M test/phpunit/DateLibTest.php

  Log Message:
  -----------
  Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal

# Conflicts:
#       htdocs/core/menus/standard/eldy.lib.php


  Commit: 806d25ae4116f5141a0c2f8f6404ed4b738d4979
      
https://github.com/Dolibarr/dolibarr/commit/806d25ae4116f5141a0c2f8f6404ed4b738d4979
  Author: Alexandre SPANGARO <address@hidden>
  Date:   2017-06-05 (Mon, 05 Jun 2017)

  Changed paths:
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_journal.sql

  Log Message:
  -----------
  Activate multi-journal on expensereport journal


  Commit: c50006c91bb51490099d6167d7bc08459ff58b0b
      
https://github.com/Dolibarr/dolibarr/commit/c50006c91bb51490099d6167d7bc08459ff58b0b
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M htdocs/accountancy/journal/bankjournal.php
    M htdocs/accountancy/journal/expensereportsjournal.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/install/mysql/data/llx_accounting.sql
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/install/mysql/tables/llx_accounting_journal.sql

  Log Message:
  -----------
  Merge pull request #6936 from aspangaro/6.0-multijournal

Accountancy - Activate multijournal on bank_journal


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2510ec70153e...c50006c91bb5