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

Update work

Browse Source
This commit is contained in:
aspangaro 2015-03-20 06:36:48 +01:00
parent c4a580723d
commit 0e01dbd44e
12 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/donations/admin/dons.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2012-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
*
* 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 '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'" />';
print '<input type="hidden" name="action" value="set_DONATION_MESSAGE" />';
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>';
print '<td>'.$langs->trans("Parameters").'</td>';
print '<td width="80">&nbsp;</td>';
print "</tr>\n";
$var=true;
@ -210,7 +211,7 @@ print '</form>';
/*
* French params
*/
if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR")
if (preg_match('/fr/i',$outputlangs->defaultlang))
{
print '<br>';
print_titre($langs->trans("FrenchOptions"));

6
htdocs/donations/card.php
View File

@ -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';

6
htdocs/donations/core/modules/dons/html_cerfafr.modules.php
View File

@ -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);

6
htdocs/donations/core/modules/dons/modules_don.php
View File

@ -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;

6
htdocs/donations/core/modules/modDon.class.php
View File

@ -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
*/

4
htdocs/donations/document.php
View File

@ -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");

2
htdocs/donations/index.php
View File

@ -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");

6
htdocs/donations/info.php
View File

@ -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';

6
htdocs/donations/list.php
View File

@ -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';

4
htdocs/donations/payment.php
View File

@ -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';

2
htdocs/donations/stats.php
View File

@ -22,7 +22,7 @@
* \brief Page des statistiques de dons
*/
require '../../main.inc.php';
require '../main.inc.php';
$langs->load("donations");

2
htdocs/langs/en_US/donations.lang
View File

@ -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