[Dolibarr-git] [Dolibarr/dolibarr] 984a56: FIX : #5776

[Laurent Destailleur]

  Branch: refs/heads/4.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 984a56adc54e278b7da96a227d7badde06e69d41
      
https://github.com/Dolibarr/dolibarr/commit/984a56adc54e278b7da96a227d7badde06e69d41
  Author: florian HENRY <address@hidden>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php

  Log Message:
  -----------
  FIX : #5776


  Commit: e531735444b1cde1e7e08796e6c33c4b556bb524
      
https://github.com/Dolibarr/dolibarr/commit/e531735444b1cde1e7e08796e6c33c4b556bb524
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php

  Log Message:
  -----------
  Merge pull request #5777 from atm-florian/4.0_fixODTwithextrafieldsCheckbox

FIX : #5776


Compare: 
https://github.com/Dolibarr/dolibarr/compare/dc45776d3189...e531735444b1