[Dolibarr-git] [Dolibarr/dolibarr] bd69d3: New: Add number of expense reports to pay

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: bd69d37c3a23ac5eb25dcd7e23f092a66d474fb9
      
https://github.com/Dolibarr/dolibarr/commit/bd69d37c3a23ac5eb25dcd7e23f092a66d474fb9
  Author: aspangaro <address@hidden>
  Date:   2015-08-17 (Mon, 17 Aug 2015)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/core/class/conf.class.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_const.sql
    A htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  New: Add number of expense reports to pay


  Commit: e4bac2adfd101b3b77a4481364f7f56114468def
      
https://github.com/Dolibarr/dolibarr/commit/e4bac2adfd101b3b77a4481364f7f56114468def
  Author: aspangaro <address@hidden>
  Date:   2015-08-30 (Sun, 30 Aug 2015)

  Changed paths:
    M COPYRIGHT
    M ChangeLog
    M build.xml
    M build/debian/README.howto
    M dev/fixdosfiles.sh
    M dev/initdata/mysqldump_dolibarr_3.8.0.sql
    M htdocs/accountancy/customer/list.php
    M htdocs/accountancy/journal/sellsjournal.php
    M htdocs/admin/tools/listevents.php
    M htdocs/comm/askpricesupplier/index.php
    M htdocs/comm/mailing/list.php
    M htdocs/comm/propal/index.php
    M htdocs/comm/prospect/index.php
    M htdocs/comm/prospect/list.php
    M htdocs/commande/index.php
    M htdocs/compta/bank/categ.php
    M htdocs/compta/bank/ligne.php
    M htdocs/compta/facture/fiche-rec.php
    M htdocs/compta/facture/list.php
    M htdocs/compta/facture/mergepdftool.php
    M htdocs/compta/journal/sellsjournal.php
    M htdocs/compta/paiement/cheque/card.php
    M htdocs/compta/paiement/cheque/class/remisecheque.class.php
    M htdocs/compta/paiement/list.php
    M htdocs/contact/list.php
    M htdocs/contrat/services.php
    M htdocs/core/ajax/box.php
    M htdocs/core/ajax/security.php
    M htdocs/core/boxes/box_contacts.php
    M htdocs/core/class/CMailFile.class.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/extrafields.class.php
    M htdocs/core/class/html.form.class.php
    M htdocs/core/class/html.formother.class.php
    M htdocs/core/class/smtps.class.php
    M htdocs/core/class/translate.class.php
    M htdocs/core/lib/date.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/lib/security2.lib.php
    M htdocs/core/menus/standard/eldy.lib.php
    M htdocs/core/modules/cheque/pdf/pdf_blochet.class.php
    M htdocs/core/modules/contract/doc/pdf_strato.modules.php
    M htdocs/core/modules/dons/html_cerfafr.modules.php
    M htdocs/core/modules/modContrat.class.php
    M htdocs/core/modules/project/doc/pdf_baleine.modules.php
    M htdocs/core/modules/project/doc/pdf_beluga.modules.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/core/tpl/objectline_edit.tpl.php
    M htdocs/don/card.php
    M htdocs/expedition/card.php
    M htdocs/expedition/class/expedition.class.php
    M htdocs/expedition/index.php
    M htdocs/exports/export.php
    M htdocs/fourn/class/fournisseur.facture.class.php
    M htdocs/fourn/commande/index.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/list.php
    M htdocs/imports/import.php
    M htdocs/install/mysql/migration/3.7.0-3.8.0.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/install/mysql/tables/llx_accounting_system.sql
    M htdocs/install/mysql/tables/llx_accountingaccount.sql
    M htdocs/install/mysql/tables/llx_societe_remise_except.sql
    M htdocs/langs/en_US/compta.lang
    M htdocs/langs/en_US/contracts.lang
    M htdocs/langs/en_US/errors.lang
    M htdocs/langs/en_US/exports.lang
    M htdocs/langs/en_US/main.lang
    M htdocs/langs/en_US/projects.lang
    M htdocs/langs/fr_FR/errors.lang
    M htdocs/product/card.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/price.php
    M htdocs/product/stock/class/mouvementstock.class.php
    M htdocs/product/stock/mouvement.php
    M htdocs/projet/activity/perday.php
    M htdocs/projet/activity/perweek.php
    M htdocs/societe/class/societe.class.php
    M htdocs/user/card.php
    M htdocs/user/class/user.class.php

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

Conflicts:
        htdocs/install/mysql/migration/3.8.0-3.9.0.sql


  Commit: 3e45cab352346b94061bb263bd2d74b99d8dceab
      
https://github.com/Dolibarr/dolibarr/commit/3e45cab352346b94061bb263bd2d74b99d8dceab
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-30 (Sun, 30 Aug 2015)

  Changed paths:
    M htdocs/admin/delais.php
    M htdocs/core/class/conf.class.php
    M htdocs/expensereport/class/expensereport.class.php
    M htdocs/index.php
    M htdocs/install/mysql/data/llx_const.sql
    M htdocs/install/mysql/migration/3.8.0-3.9.0.sql
    M htdocs/langs/en_US/trips.lang

  Log Message:
  -----------
  Merge pull request #3389 from aspangaro/develop-57

New: Add number of expense reports to pay in dashboard and a grace period


Compare: 
https://github.com/Dolibarr/dolibarr/compare/25fca6615a4f...3e45cab35234