[Dolibarr-git] [Dolibarr/dolibarr] 02b5d9: FIX #6945

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 02b5d9e6f7574be222e74be648d44e209d06113a
      
https://github.com/Dolibarr/dolibarr/commit/02b5d9e6f7574be222e74be648d44e209d06113a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M htdocs/accountancy/admin/fiscalyear.php
    M htdocs/accountancy/admin/importaccounts.php
    M htdocs/accountancy/admin/productaccount.php
    M htdocs/adherents/list.php
    M htdocs/adherents/type.php
    M htdocs/admin/defaultvalues.php
    M htdocs/admin/translation.php
    M htdocs/bookmarks/list.php
    M htdocs/comm/action/document.php
    M htdocs/comm/action/index.php
    M htdocs/comm/action/pertype.php
    M htdocs/comm/action/peruser.php
    M htdocs/comm/card.php
    M htdocs/comm/mailing/cibles.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/document.php
    M htdocs/comm/propal/list.php
    M htdocs/commande/customer.php
    M htdocs/commande/document.php
    M htdocs/commande/list.php
    M htdocs/compta/bank/bankentries.php
    M htdocs/compta/bank/index.php
    M htdocs/compta/bank/releve.php
    M htdocs/compta/bank/various_payment/document.php
    M htdocs/compta/bank/various_payment/index.php
    M htdocs/compta/charges/index.php
    M htdocs/compta/clients.php
    M htdocs/compta/deplacement/document.php
    M htdocs/compta/deplacement/index.php
    M htdocs/compta/deplacement/list.php
    M htdocs/compta/facture/document.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/paiement/avalider.php
    M htdocs/compta/paiement/cheque/list.php
    M htdocs/compta/paiement/list.php
    M htdocs/compta/prelevement/bons.php
    M htdocs/compta/prelevement/card.php
    M htdocs/compta/prelevement/demandes.php
    M htdocs/compta/prelevement/factures.php
    M htdocs/compta/prelevement/list.php
    M htdocs/compta/recap-compta.php
    M htdocs/compta/resultat/clientfourn.php
    M htdocs/compta/salaries/document.php
    M htdocs/compta/salaries/index.php
    M htdocs/compta/sociales/index.php
    M htdocs/compta/sociales/payments.php
    M htdocs/compta/tva/reglement.php
    M htdocs/contact/agenda.php
    M htdocs/contrat/document.php
    M htdocs/contrat/list.php
    M htdocs/contrat/services.php
    M htdocs/core/ajax/ajaxdirpreview.php
    M htdocs/cron/list.php
    M htdocs/don/document.php
    M htdocs/don/list.php
    M htdocs/ecm/docdir.php
    M htdocs/ecm/docfile.php
    M htdocs/ecm/docmine.php
    M htdocs/ecm/index.php
    M htdocs/ecm/index_auto.php
    M htdocs/ecm/search.php
    M htdocs/expedition/list.php
    M htdocs/expensereport/document.php
    M htdocs/expensereport/index.php
    M htdocs/expensereport/list.php
    M htdocs/fichinter/document.php
    M htdocs/fichinter/list.php
    M htdocs/fourn/commande/document.php
    M htdocs/fourn/commande/list.php
    M htdocs/fourn/contact.php
    M htdocs/fourn/facture/impayees.php
    M htdocs/fourn/facture/paiement.php
    M htdocs/ftp/index.php
    M htdocs/holiday/document.php
    M htdocs/loan/index.php
    M htdocs/margin/agentMargins.php
    M htdocs/margin/customerMargins.php
    M htdocs/margin/productMargins.php
    M htdocs/margin/tabs/productMargins.php
    M htdocs/margin/tabs/thirdpartyMargins.php
    M htdocs/modulebuilder/template/myobject_list.php
    M htdocs/opensurvey/list.php
    M htdocs/product/document.php
    M htdocs/product/inventory/list.php
    M htdocs/product/list-with-listview.php
    M htdocs/product/list.php
    M htdocs/product/popuprop.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stock/productlot_list.php
    M htdocs/product/stock/replenish.php
    M htdocs/projet/document.php
    M htdocs/projet/tasks/document.php
    M htdocs/projet/tasks/list.php
    M htdocs/projet/tasks/time.php
    M htdocs/public/members/public_list.php
    M htdocs/resource/document.php
    M htdocs/societe/agenda.php
    M htdocs/societe/consumption.php
    M htdocs/societe/document.php
    M htdocs/supplier_proposal/document.php
    M htdocs/supplier_proposal/list.php

  Log Message:
  -----------
  FIX #6945


  Commit: 4b6bd2b6eb236670386f569eddfb0ef9778d8d54
      
https://github.com/Dolibarr/dolibarr/commit/4b6bd2b6eb236670386f569eddfb0ef9778d8d54
  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/class/conf.class.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 branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/2f5952596752...4b6bd2b6eb23