[Dolibarr-git] [Dolibarr/dolibarr] 102179: FIX #5414

[Laurent Destailleur]

  Branch: refs/heads/3.9
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 102179028c6db5db2ee3277ad6e04e0954389e1c
      
https://github.com/Dolibarr/dolibarr/commit/102179028c6db5db2ee3277ad6e04e0954389e1c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/langs/en_US/admin.lang

  Log Message:
  -----------
  FIX #5414


  Commit: 9e82a8b4e6e9154dbc522579cf1e69410e7f34cd
      
https://github.com/Dolibarr/dolibarr/commit/9e82a8b4e6e9154dbc522579cf1e69410e7f34cd
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M htdocs/comm/action/card.php
    M htdocs/expedition/class/expedition.class.php

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


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1d0e14be6203...9e82a8b4e6e9