[Dolibarr-git] [Dolibarr/dolibarr] f18c98: NEW : print event type on third party card tab age...

[Juanjo Menent]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: f18c983ba5ed89f91e0e7c3ece3ac197f7890954
      
https://github.com/Dolibarr/dolibarr/commit/f18c983ba5ed89f91e0e7c3ece3ac197f7890954
  Author: Gauthier <address@hidden>
  Date:   2015-07-21 (Tue, 21 Jul 2015)

  Changed paths:
    M htdocs/core/lib/company.lib.php

  Log Message:
  -----------
  NEW : print event type on third party card tab agenda list (only if 
AGENDA_USE_EVENT_TYPE = 1)

Conflicts:
        htdocs/core/lib/company.lib.php


  Commit: 993037ec9e744bdc858eae9542a2552199dafe8f
      
https://github.com/Dolibarr/dolibarr/commit/993037ec9e744bdc858eae9542a2552199dafe8f
  Author: Juanjo Menent <address@hidden>
  Date:   2015-08-12 (Wed, 12 Aug 2015)

  Changed paths:
    M htdocs/core/lib/company.lib.php

  Log Message:
  -----------
  Merge pull request #3371 from 
atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab

NEW : print event type on third party card tab agenda list (only if A…


Compare: 
https://github.com/Dolibarr/dolibarr/compare/6964f80d8f05...993037ec9e74