lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8351 from hregis/develop_dict

Browse Source 
Fix: dolibarrizzzz
This commit is contained in:
Laurent Destailleur 2018-03-11 19:33:36 +01:00 committed by GitHub
commit 2245a2eaf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/ticketsup.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io> /* Copyright (C) 2013-2018 Jean-François FERRY <hello@librethic.io>
* Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr> * Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify

14
htdocs/admin/ticketsup_extrafields.php
View File

@ -1,6 +1,5 @@
<?php <?php
/* Ticket incident/support management /* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
* Copyright (C) 2013-2016 Jean-François FERRY <hello@librethic.io>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,15 +20,8 @@
* \ingroup ticketsup * \ingroup ticketsup
* \brief Page to setup extra fields of ticket * \brief Page to setup extra fields of ticket
*/ */
$res = '';
if (file_exists("../../main.inc.php")) { require '../main.inc.php';
$res = include "../../main.inc.php"; // From htdocs directory
} elseif (!$res && file_exists("../../../main.inc.php")) {
$res = include "../../../main.inc.php"; // From "custom" directory
} else {
die("Include of main fails");
}
// Libraries
require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php"; require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php";
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php'; require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';

9
htdocs/core/lib/ticketsup.lib.php
View File

@ -1,7 +1,6 @@
<?php <?php
/* /* Copyright (C) 2013-2018 Jean-François FERRY <hello@librethic.io>
* Copyright (C) 2013-2018 Jean-François FERRY <hello@librethic.io> * Copyright (C) 2016 Christophe Battarel <christophe@altairis.fr>
* 2016 Christophe Battarel <christophe@altairis.fr>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -25,7 +24,7 @@
/** /**
* Build tabs for admin page * Build tabs for admin page
* *
* @return array * @return array
*/ */
function ticketsupAdminPrepareHead() function ticketsupAdminPrepareHead()
@ -37,7 +36,7 @@ function ticketsupAdminPrepareHead()
$h = 0; $h = 0;
$head = array(); $head = array();
$head[$h][0] = DOL_URL_ROOT.'/admin/admin_ticketsup.php'; $head[$h][0] = DOL_URL_ROOT.'/admin/ticketsup.php';
$head[$h][1] = $langs->trans("TicketSupSettings"); $head[$h][1] = $langs->trans("TicketSupSettings");
$head[$h][2] = 'settings'; $head[$h][2] = 'settings';
$h++; $h++;