[Dolibarr-git] [Dolibarr/dolibarr] 0536d6: FIX #7330

[Laurent Destailleur]

  Branch: refs/heads/6.0
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 0536d6cbed522893ddbfd3ce7c69847a8eac8fee
      
https://github.com/Dolibarr/dolibarr/commit/0536d6cbed522893ddbfd3ce7c69847a8eac8fee
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M htdocs/contrat/list.php

  Log Message:
  -----------
  FIX #7330


  Commit: 6ac1b6e82eed373a7a0d061a3961268f6dd2689d
      
https://github.com/Dolibarr/dolibarr/commit/6ac1b6e82eed373a7a0d061a3961268f6dd2689d
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M htdocs/modulebuilder/template/myobject_list.php

  Log Message:
  -----------
  Fix template


  Commit: 0c01c7cebabb435b5104899af0ba7583d128308a
      
https://github.com/Dolibarr/dolibarr/commit/0c01c7cebabb435b5104899af0ba7583d128308a
  Author: Laurent Destailleur <address@hidden>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M htdocs/expensereport/class/expensereport.class.php

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


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

  Changed paths:
    M htdocs/includes/odtphp/Segment.php

  Log Message:
  -----------
  FIX #7420


Compare: 
https://github.com/Dolibarr/dolibarr/compare/8536d0f6e9e6...aba907d1a880