[Dolibarr-git] [Dolibarr/dolibarr] e93cef: FIX #6985

[Laurent Destailleur]

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

  Changed paths:
    M htdocs/adherents/card.php
    M htdocs/adherents/type.php
    M htdocs/categories/card.php
    M htdocs/categories/edit.php
    M htdocs/comm/action/card.php
    M htdocs/comm/mailing/advtargetemailing.php
    M htdocs/comm/mailing/card.php
    M htdocs/comm/propal/card.php
    M htdocs/commande/card.php
    M htdocs/commande/orderstoinvoice.php
    M htdocs/compta/bank/card.php
    M htdocs/compta/bank/various_payment/card.php
    M htdocs/compta/deplacement/card.php
    M htdocs/compta/facture/card.php
    M htdocs/compta/localtax/card.php
    M htdocs/compta/salaries/card.php
    M htdocs/compta/tva/card.php
    M htdocs/contact/card.php
    M htdocs/contrat/card.php
    M htdocs/core/tpl/extrafields_view.tpl.php
    M htdocs/don/card.php
    M htdocs/expedition/card.php
    M htdocs/expensereport/card.php
    M htdocs/fichinter/card.php
    M htdocs/fourn/commande/card.php
    M htdocs/fourn/commande/orderstoinvoice.php
    M htdocs/fourn/facture/card.php
    M htdocs/product/card.php
    M htdocs/product/document.php
    M htdocs/product/fournisseurs.php
    M htdocs/product/stats/commande.php
    M htdocs/product/stats/commande_fournisseur.php
    M htdocs/product/stats/contrat.php
    M htdocs/product/stats/facture.php
    M htdocs/product/stats/facture_fournisseur.php
    M htdocs/product/stats/propal.php
    M htdocs/product/stock/product.php
    M htdocs/projet/card.php
    M htdocs/projet/tasks.php
    M htdocs/projet/tasks/task.php
    M htdocs/resource/add.php
    M htdocs/resource/card.php
    M htdocs/societe/commerciaux.php
    M htdocs/supplier_proposal/card.php
    M htdocs/user/card.php
    M htdocs/user/group/card.php

  Log Message:
  -----------
  FIX #6985


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

  Changed paths:
    M htdocs/expedition/class/expedition.class.php
    M htdocs/fourn/class/paiementfourn.class.php
    M htdocs/fourn/facture/card.php
    M htdocs/projet/ajax/projects.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/4274d9910c2e...961594afad3b