[Dolibarr-git] [Dolibarr/dolibarr] 00cd61: Add informations about contacts of thirdparty into...

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 00cd616f4c970566e62c6f94d8bcd137eda6fdaa
      
https://github.com/Dolibarr/dolibarr/commit/00cd616f4c970566e62c6f94d8bcd137eda6fdaa
  Author: Jean-François Ferry <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Add informations about contacts of thirdparty into ODT


  Commit: fd45bb16bdc50879f1efd72844877751806916ed
      
https://github.com/Dolibarr/dolibarr/commit/fd45bb16bdc50879f1efd72844877751806916ed
  Author: jfefe <address@hidden>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Fix : make ODT substitution for company after contacts


  Commit: 0219d53f698d708c69957959c45b7cad1d21a7bc
      
https://github.com/Dolibarr/dolibarr/commit/0219d53f698d708c69957959c45b7cad1d21a7bc
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Merge branch 'odt_thirdpartycontact' of github.com:aternatik/dolibarr into 
aternatik-odt_thirdpartycontact


  Commit: 7070ee36ee60791602fbef14535395dd92b0b338
      
https://github.com/Dolibarr/dolibarr/commit/7070ee36ee60791602fbef14535395dd92b0b338
  Author: Laurent Destailleur <address@hidden>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    M htdocs/core/class/commondocgenerator.class.php
    M htdocs/core/modules/societe/doc/doc_generic_odt.modules.php

  Log Message:
  -----------
  Merge branch 'aternatik-odt_thirdpartycontact' into develop


Compare: 
https://github.com/Dolibarr/dolibarr/compare/1c0b0ef8c96f...7070ee36ee60