[Dolibarr-git] [Dolibarr/dolibarr] f069ef: FIX #6767

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f069ef98445e651a37487ae900730a5b2b550c20
      
https://github.com/Dolibarr/dolibarr/commit/f069ef98445e651a37487ae900730a5b2b550c20
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M htdocs/admin/expensereport.php
    M htdocs/admin/expensereport_extrafields.php
    M htdocs/core/lib/pdf.lib.php
    M htdocs/install/mysql/migration/5.0.0-6.0.0.sql
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  FIX #6767


  Commit: fecf5efa5b5d4d1f0129278182c07efeae381b13
      
https://github.com/Dolibarr/dolibarr/commit/fecf5efa5b5d4d1f0129278182c07efeae381b13
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-05-05 (Fri, 05 May 2017)

  Changed paths:
    M htdocs/admin/loan.php
    M htdocs/admin/mails_templates.php
    M htdocs/admin/modules.php
    M htdocs/admin/oauth.php
    M htdocs/admin/perms.php
    M htdocs/admin/salaries.php
    M htdocs/admin/supplier_invoice.php
    M htdocs/admin/supplier_order.php
    M htdocs/admin/supplier_payment.php
    M htdocs/admin/syslog.php
    M htdocs/admin/taxes.php
    M htdocs/admin/websites.php
    M htdocs/admin/workflow.php
    M htdocs/compta/facture/fiche-rec.php

  Log Message:
  -----------
  Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/aa8aa5672b5c...fecf5efa5b5d