diff --git a/htdocs/donations/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php similarity index 100% rename from htdocs/donations/core/lib/donation.lib.php rename to htdocs/core/lib/donation.lib.php diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html similarity index 100% rename from htdocs/donations/core/modules/dons/html_cerfafr.html rename to htdocs/core/modules/dons/html_cerfafr.html diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php similarity index 99% rename from htdocs/donations/core/modules/dons/html_cerfafr.modules.php rename to htdocs/core/modules/dons/html_cerfafr.modules.php index 4f4c4b7be1a..69484033374 100644 --- a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -24,7 +24,7 @@ * \ingroup don * \brief Form of donation */ -require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; diff --git a/htdocs/donations/core/modules/dons/index.html b/htdocs/core/modules/dons/index.html similarity index 100% rename from htdocs/donations/core/modules/dons/index.html rename to htdocs/core/modules/dons/index.html diff --git a/htdocs/donations/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php similarity index 97% rename from htdocs/donations/core/modules/dons/modules_don.php rename to htdocs/core/modules/dons/modules_don.php index f3a38bbfc0b..abb7dd105ae 100644 --- a/htdocs/donations/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/donations/core/modules/dons/modules_don.php + * \file htdocs/core/modules/dons/modules_don.php * \ingroup donations * \brief File of class to manage donation document generation */ @@ -201,7 +201,7 @@ function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $ $file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php"; // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."donations/core/modules/dons/".$file,0); + $file=dol_buildpath($reldir."core/modules/dons/".$file,0); if (file_exists($file)) { $filefound=1; diff --git a/htdocs/donations/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php similarity index 100% rename from htdocs/donations/core/modules/modDon.class.php rename to htdocs/core/modules/modDon.class.php diff --git a/htdocs/donations/admin/donation.php b/htdocs/donations/admin/donation.php index ba0a72843fc..6c363c4bdc1 100644 --- a/htdocs/donations/admin/donation.php +++ b/htdocs/donations/admin/donation.php @@ -25,7 +25,7 @@ */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; @@ -54,7 +54,8 @@ if ($action == 'specimen') $don->initAsSpecimen(); // Search template files - $dir = DOL_DOCUMENT_ROOT . "/donations/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { diff --git a/htdocs/donations/card.php b/htdocs/donations/card.php index a8424da558e..6c2bd28a2d0 100644 --- a/htdocs/donations/card.php +++ b/htdocs/donations/card.php @@ -20,14 +20,14 @@ */ /** - * \file htdocs/donations/card.php - * \ingroup don - * \brief Page of donation card + * \file htdocs/donations/card.php + * \ingroup donations + * \brief Page of donation card */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/document.php b/htdocs/donations/document.php index 19088425c8b..0cfb0447630 100644 --- a/htdocs/donations/document.php +++ b/htdocs/donations/document.php @@ -17,7 +17,7 @@ /** * \file htdocs/donations/document.php - * \ingroup Donation + * \ingroup donations * \brief Page of linked files into donations */ @@ -25,7 +25,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); diff --git a/htdocs/donations/index.php b/htdocs/donations/index.php index 7ed677f6f58..ac64d6b2dde 100644 --- a/htdocs/donations/index.php +++ b/htdocs/donations/index.php @@ -18,9 +18,9 @@ */ /** - * \file htdocs/donations/index.php - * \ingroup don - * \brief Home page of donation module + * \file htdocs/donations/index.php + * \ingroup donations + * \brief Home page of donation module */ require '../main.inc.php'; diff --git a/htdocs/donations/info.php b/htdocs/donations/info.php index b3c60cf004e..a85b734fcf6 100644 --- a/htdocs/donations/info.php +++ b/htdocs/donations/info.php @@ -22,7 +22,7 @@ */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/payment/card.php b/htdocs/donations/payment/card.php index 3e4d03d15d2..6b30fdcc89b 100644 --- a/htdocs/donations/payment/card.php +++ b/htdocs/donations/payment/card.php @@ -121,7 +121,7 @@ $form = new Form($db); $h=0; -$head[$h][0] = DOL_URL_ROOT.'/donations/payment/card.php?id='.$_GET["id"]; +$head[$h][0] = DOL_URL_ROOT.'/donations/payment/card.php?id='.$id; $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++;