[Dolibarr-git] [Dolibarr/dolibarr] 4dce09: include expense reports in linked objects section ...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 4dce09cd27fab0fd41b109884929f7802f2db43d
      
https://github.com/Dolibarr/dolibarr/commit/4dce09cd27fab0fd41b109884929f7802f2db43d
  Author: abb <address@hidden>
  Date:   2016-02-13 (Sat, 13 Feb 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    A htdocs/expensereport/tpl/index.html
    A htdocs/expensereport/tpl/linkedobjectblock.tpl.php
    A htdocs/langs/en_US/expensereports.lang
    A htdocs/langs/eu_ES/expensereports.lang
    A htdocs/langs/fr_FR/expensereports.lang

  Log Message:
  -----------
  include expense reports in linked objects section and provide template for 
them in this section

Conflicts:
        htdocs/core/class/html.form.class.php


  Commit: 7692c39879b46dd421ebae77d1a0aacad1f18a8c
      
https://github.com/Dolibarr/dolibarr/commit/7692c39879b46dd421ebae77d1a0aacad1f18a8c
  Author: Laurent Destailleur <address@hidden>
  Date:   2016-03-18 (Fri, 18 Mar 2016)

  Changed paths:
    M htdocs/core/class/html.form.class.php
    A htdocs/expensereport/tpl/index.html
    A htdocs/expensereport/tpl/linkedobjectblock.tpl.php
    A htdocs/langs/en_US/expensereports.lang
    A htdocs/langs/eu_ES/expensereports.lang
    A htdocs/langs/fr_FR/expensereports.lang

  Log Message:
  -----------
  Merge pull request #4614 from bafbes/abb-3

include expense reports in linked objects section and provide template for them 
in this section


Compare: 
https://github.com/Dolibarr/dolibarr/compare/7e8e05d93853...7692c39879b4