[Dolibarr-git] [Dolibarr/dolibarr] 6c126d: FIX #4141

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 6c126da9a9aac07b26de0d22a462d712f6898a02
      
https://github.com/Dolibarr/dolibarr/commit/6c126da9a9aac07b26de0d22a462d712f6898a02
  Author: cla <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/fichinter/card.php

  Log Message:
  -----------
  FIX #4141


  Commit: e1c27216cee851f30f788aee64e7ea7c3d60498f
      
https://github.com/Dolibarr/dolibarr/commit/e1c27216cee851f30f788aee64e7ea7c3d60498f
  Author: cla <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  FIX #4825


  Commit: c59c86e648890ca69db14281c5747de806093396
      
https://github.com/Dolibarr/dolibarr/commit/c59c86e648890ca69db14281c5747de806093396
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M htdocs/compta/facture/list.php
    M htdocs/fourn/facture/list.php

  Log Message:
  -----------
  Merge branch 'develop' of https://github.com/aschio/dolibarr into
develop

Conflicts:
        htdocs/fourn/facture/list.php


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1748da6c56fa...c59c86e64889