[Dolibarr-git] [Dolibarr/dolibarr] 801e2b: Fix #4239

[Laurent Destailleur]

  Branch: refs/heads/3.7
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 801e2bca4b4b844c419889b03b7eba0e1d34d3bf
      
https://github.com/Dolibarr/dolibarr/commit/801e2bca4b4b844c419889b03b7eba0e1d34d3bf
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M htdocs/core/tpl/objectline_edit.tpl.php

  Log Message:
  -----------
  Fix #4239


  Commit: 861376e4613b9cf8d7e69203536314457330c1da
      
https://github.com/Dolibarr/dolibarr/commit/861376e4613b9cf8d7e69203536314457330c1da
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-01-10 (Sun, 10 Jan 2016)

  Changed paths:
    M ChangeLog
    M htdocs/admin/agenda_extsites.php
    M htdocs/admin/dict.php
    M htdocs/main.inc.php

  Log Message:
  -----------
  Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7


Compare: 
https://github.com/Dolibarr/dolibarr/compare/40f0d0c9f2bf...861376e4613b