diff --git a/htdocs/donations/admin/dons.php b/htdocs/donations/admin/dons.php index f4afddc65d0..daf7b2f0e6d 100644 --- a/htdocs/donations/admin/dons.php +++ b/htdocs/donations/admin/dons.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2012-2013 Juanjo Menent * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -19,13 +19,14 @@ */ /** - * \file htdocs/admin/dons.php - * \ingroup dons - * \brief Page d'administration/configuration du module Dons + * \file htdocs/donations/admin/dons.php + * \ingroup donations + * \brief Page to setup the donation module */ -require '../main.inc.php'; +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("admin"); $langs->load("donations"); @@ -52,7 +53,7 @@ if ($action == 'specimen') $don->initAsSpecimen(); // Search template files - $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/donations/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { @@ -173,7 +174,7 @@ else if ($action == 'setart885') { * View */ -$dir = "../core/modules/dons/"; +$dir = DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/'; $form=new Form($db); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); @@ -191,7 +192,7 @@ print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print "\n"; $var=true; @@ -210,7 +211,7 @@ print ''; /* * French params */ -if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR") +if (preg_match('/fr/i',$outputlangs->defaultlang)) { print '
'; print_titre($langs->trans("FrenchOptions")); diff --git a/htdocs/donations/card.php b/htdocs/donations/card.php index 79b97c2fde3..0d1cea0d4f1 100644 --- a/htdocs/donations/card.php +++ b/htdocs/donations/card.php @@ -25,9 +25,9 @@ * \brief Page of donation card */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +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/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/core/modules/dons/html_cerfafr.modules.php b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php index 0efaf8c4524..4f4c4b7be1a 100644 --- a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/core/modules/dons/html_cerfafr.modules.php + * \file htdocs/donations/core/modules/dons/html_cerfafr.modules.php * \ingroup don * \brief Form of donation */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/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'; @@ -132,7 +132,7 @@ class html_cerfafr extends ModeleDon else $paymentmode = ''; // Define contents - $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; + $donmodel=DOL_DOCUMENT_ROOT ."/donations/core/modules/dons/html_cerfafr.html"; $form = implode('', file($donmodel)); $form = str_replace('__REF__',$don->id,$form); $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form); diff --git a/htdocs/donations/core/modules/dons/modules_don.php b/htdocs/donations/core/modules/dons/modules_don.php index 69db5bec011..f3a38bbfc0b 100644 --- a/htdocs/donations/core/modules/dons/modules_don.php +++ b/htdocs/donations/core/modules/dons/modules_don.php @@ -20,8 +20,8 @@ */ /** - * \file htdocs/core/modules/dons/modules_don.php - * \ingroup don + * \file htdocs/donations/core/modules/dons/modules_don.php + * \ingroup donations * \brief File of class to manage donation document generation */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; @@ -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."core/modules/dons/".$file,0); + $file=dol_buildpath($reldir."donations/core/modules/dons/".$file,0); if (file_exists($file)) { $filefound=1; diff --git a/htdocs/donations/core/modules/modDon.class.php b/htdocs/donations/core/modules/modDon.class.php index bf5db49ec82..d602d867e1c 100644 --- a/htdocs/donations/core/modules/modDon.class.php +++ b/htdocs/donations/core/modules/modDon.class.php @@ -19,10 +19,10 @@ */ /** - * \defgroup don Module donation + * \defgroup don Module donations * \brief Module to manage the follow-up of the donations - * \file htdocs/core/modules/modDon.class.php - * \ingroup don + * \file htdocs/donations/core/modules/modDon.class.php + * \ingroup donations * \brief Description and activation file for module Donation */ diff --git a/htdocs/donations/document.php b/htdocs/donations/document.php index 16729a9bd81..19088425c8b 100644 --- a/htdocs/donations/document.php +++ b/htdocs/donations/document.php @@ -21,11 +21,11 @@ * \brief Page of linked files into donations */ -require '../../main.inc.php'; +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.'/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/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 9a4f13e7e4a..7ed677f6f58 100644 --- a/htdocs/donations/index.php +++ b/htdocs/donations/index.php @@ -23,7 +23,7 @@ * \brief Home page of donation module */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/info.php b/htdocs/donations/info.php index 2121e379a65..b3c60cf004e 100644 --- a/htdocs/donations/info.php +++ b/htdocs/donations/info.php @@ -17,12 +17,12 @@ /** * \file htdocs/donations/info.php - * \ingroup Donation + * \ingroup donations * \brief Page to show a donation information */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/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/list.php b/htdocs/donations/list.php index 5e0c1690413..4f49c28fb59 100644 --- a/htdocs/donations/list.php +++ b/htdocs/donations/list.php @@ -20,11 +20,11 @@ /** * \file htdocs/donations/list.php - * \ingroup don - * \brief Page de liste des dons + * \ingroup donations + * \brief List of donations */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; diff --git a/htdocs/donations/payment.php b/htdocs/donations/payment.php index 4df5b1c0e22..b86678dcd39 100644 --- a/htdocs/donations/payment.php +++ b/htdocs/donations/payment.php @@ -17,11 +17,11 @@ /** * \file htdocs/donations/payment.php - * \ingroup Donation + * \ingroup donations * \brief Page to add payment of a donation */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/donations/stats.php b/htdocs/donations/stats.php index 7552c29ebc0..2dacd9e093f 100644 --- a/htdocs/donations/stats.php +++ b/htdocs/donations/stats.php @@ -22,7 +22,7 @@ * \brief Page des statistiques de dons */ -require '../../main.inc.php'; +require '../main.inc.php'; $langs->load("donations"); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 77d91ad801d..13634f98380 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -21,6 +21,8 @@ DonationStatusPaid=Donation received DonationStatusPromiseNotValidatedShort=Draft DonationStatusPromiseValidatedShort=Validated DonationStatusPaidShort=Received +DonationTitle=Donation receipt +DonationDatePayment=Payment date ValidPromess=Validate promise DonationReceipt=Donation receipt BuildDonationReceipt=Build receipt
'.$langs->trans("Parameter").''.$langs->trans("Parameters").'