[Dolibarr-git] [Dolibarr/dolibarr] 87d073: Fix conflict with external ticketsup module

[Laurent Destailleur]

  Branch: refs/heads/develop
  Home:   https://github.com/Dolibarr/dolibarr
  Commit: 87d073b5cd272d37f007d9da8879b97ccff53f17
      
https://github.com/Dolibarr/dolibarr/commit/87d073b5cd272d37f007d9da8879b97ccff53f17
  Author: Laurent Destailleur <address@hidden>
  Date:   2018-06-04 (Mon, 04 Jun 2018)

  Changed paths:
    A htdocs/admin/ticket.php
    A htdocs/admin/ticket_extrafields.php
    R htdocs/admin/ticketsup.php
    R htdocs/admin/ticketsup_extrafields.php
    A htdocs/core/boxes/box_last_modified_ticket.php
    R htdocs/core/boxes/box_last_modified_ticketsup.php
    A htdocs/core/boxes/box_last_ticket.php
    R htdocs/core/boxes/box_last_ticketsup.php
    M htdocs/core/class/commonobject.class.php
    M htdocs/core/class/html.formfile.class.php
    A htdocs/core/class/html.formticket.class.php
    R htdocs/core/class/html.formticketsup.class.php
    M htdocs/core/lib/functions.lib.php
    M htdocs/core/lib/functions2.lib.php
    A htdocs/core/lib/ticket.lib.php
    R htdocs/core/lib/ticketsup.lib.php
    A htdocs/core/modules/modTicket.class.php
    R htdocs/core/modules/modTicketsup.class.php
    M htdocs/core/modules/modules_ticketsup.php
    A htdocs/core/modules/ticket/mod_ticket_simple.php
    A htdocs/core/modules/ticket/mod_ticket_universal.php
    R htdocs/core/modules/ticketsup/mod_ticketsup_simple.php
    R htdocs/core/modules/ticketsup/mod_ticketsup_universal.php
    M htdocs/core/photos_resize.php
    M htdocs/core/tpl/document_actions_post_headers.tpl.php
    M htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
    A htdocs/install/mysql/data/llx_c_ticket_category.sql
    A htdocs/install/mysql/data/llx_c_ticket_severity.sql
    A htdocs/install/mysql/data/llx_c_ticket_type.sql
    R htdocs/install/mysql/data/llx_c_ticketsup_category.sql
    R htdocs/install/mysql/data/llx_c_ticketsup_severity.sql
    R htdocs/install/mysql/data/llx_c_ticketsup_type.sql
    M htdocs/install/mysql/data/llx_c_type_contact.sql
    R htdocs/install/mysql/data/llx_c_type_contact_ticketsup.sql
    M htdocs/install/mysql/migration/7.0.0-8.0.0.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_category.key.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_category.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_severity.key.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_severity.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_type.key.sql
    M htdocs/install/mysql/tables/llx_c_ticketsup_type.sql
    A htdocs/install/mysql/tables/llx_ticket.key.sql
    A htdocs/install/mysql/tables/llx_ticket.sql
    A htdocs/install/mysql/tables/llx_ticket_extrafields.sql
    A htdocs/install/mysql/tables/llx_ticket_logs.key.sql
    A htdocs/install/mysql/tables/llx_ticket_logs.sql
    A htdocs/install/mysql/tables/llx_ticket_msg.key.sql
    A htdocs/install/mysql/tables/llx_ticket_msg.sql
    R htdocs/install/mysql/tables/llx_ticketsup.key.sql
    R htdocs/install/mysql/tables/llx_ticketsup.sql
    R htdocs/install/mysql/tables/llx_ticketsup_extrafields.sql
    R htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql
    R htdocs/install/mysql/tables/llx_ticketsup_logs.sql
    R htdocs/install/mysql/tables/llx_ticketsup_msg.key.sql
    R htdocs/install/mysql/tables/llx_ticketsup_msg.sql
    A htdocs/langs/en_US/ticket.lang
    R htdocs/langs/en_US/ticketsup.lang
    M htdocs/langs/fr_FR/ticketsup.lang
    M htdocs/public/ticketsup/create_ticket.php
    M htdocs/public/ticketsup/index.php
    M htdocs/public/ticketsup/list.php
    M htdocs/public/ticketsup/view.php
    M htdocs/resource/class/html.formresource.class.php
    A htdocs/theme/eldy/img/menus/ticket.png
    A htdocs/theme/eldy/img/menus/ticket_over.png
    R htdocs/theme/eldy/img/menus/ticketsup.png
    R htdocs/theme/eldy/img/menus/ticketsup_over.png
    A htdocs/theme/eldy/img/menus_black/ticket.png
    A htdocs/theme/eldy/img/menus_black/ticket_over.png
    R htdocs/theme/eldy/img/menus_black/ticketsup.png
    R htdocs/theme/eldy/img/menus_black/ticketsup_over.png
    A htdocs/theme/eldy/img/object_ticket.png
    R htdocs/theme/eldy/img/object_ticketsup.png
    A htdocs/theme/eldy/img/title_ticket.png
    R htdocs/theme/eldy/img/title_ticketsup.png
    M htdocs/theme/eldy/style.css.php
    A htdocs/theme/md/img/menus/ticket.png
    R htdocs/theme/md/img/menus/ticketsup.png
    A htdocs/theme/md/img/object_ticket.png
    R htdocs/theme/md/img/object_ticketsup.png
    A htdocs/theme/md/img/ticket.png
    R htdocs/theme/md/img/ticketsup.png
    M htdocs/theme/md/style.css.php
    A htdocs/ticket/README.md
    A htdocs/ticket/card.php
    A htdocs/ticket/class/actions_ticket.class.php
    A htdocs/ticket/class/api_tickets.class.php
    A htdocs/ticket/class/ticket.class.php
    A htdocs/ticket/class/ticketlogs.class.php
    A htdocs/ticket/class/ticketstats.class.php
    A htdocs/ticket/class/utils_diff.class.php
    A htdocs/ticket/contact.php
    A htdocs/ticket/css/styles.css.php
    A htdocs/ticket/document.php
    A htdocs/ticket/history.php
    A htdocs/ticket/img/gplv3.png
    A htdocs/ticket/img/history.png
    A htdocs/ticket/img/mark-read.png
    A htdocs/ticket/img/messages.png
    A htdocs/ticket/img/statut0.png
    A htdocs/ticket/img/statut1.png
    A htdocs/ticket/img/statut3.png
    A htdocs/ticket/img/statut4.png
    A htdocs/ticket/img/statut5.png
    A htdocs/ticket/img/statut6.png
    A htdocs/ticket/img/statut8.png
    A htdocs/ticket/img/ticketsup.png
    A htdocs/ticket/index.php
    A htdocs/ticket/list.php
    A htdocs/ticket/new.php
    A htdocs/ticket/tpl/index.html
    A htdocs/ticket/tpl/linkedobjectblock.tpl.php
    R htdocs/ticketsup/README.md
    R htdocs/ticketsup/card.php
    R htdocs/ticketsup/class/actions_ticketsup.class.php
    R htdocs/ticketsup/class/api_tickets.class.php
    R htdocs/ticketsup/class/ticketsup.class.php
    R htdocs/ticketsup/class/ticketsuplogs.class.php
    R htdocs/ticketsup/class/ticketsupstats.class.php
    R htdocs/ticketsup/class/utils_diff.class.php
    R htdocs/ticketsup/contact.php
    R htdocs/ticketsup/css/styles.css.php
    R htdocs/ticketsup/document.php
    R htdocs/ticketsup/history.php
    R htdocs/ticketsup/img/gplv3.png
    R htdocs/ticketsup/img/history.png
    R htdocs/ticketsup/img/mark-read.png
    R htdocs/ticketsup/img/messages.png
    R htdocs/ticketsup/img/statut0.png
    R htdocs/ticketsup/img/statut1.png
    R htdocs/ticketsup/img/statut3.png
    R htdocs/ticketsup/img/statut4.png
    R htdocs/ticketsup/img/statut5.png
    R htdocs/ticketsup/img/statut6.png
    R htdocs/ticketsup/img/statut8.png
    R htdocs/ticketsup/img/ticketsup.png
    R htdocs/ticketsup/index.php
    R htdocs/ticketsup/list.php
    R htdocs/ticketsup/new.php
    R htdocs/ticketsup/tpl/index.html
    R htdocs/ticketsup/tpl/linkedobjectblock.tpl.php
    M test/phpunit/AllTests.php
    M test/phpunit/ModulesTest.php
    M test/phpunit/TicketsupTest.php

  Log Message:
  -----------
  Fix conflict with external ticketsup module



      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.