From cdce5fa4366885f4861fa764432d72e45c2e6366 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 10 Oct 2009 16:00:35 +0000
Subject: [PATCH] New: Add navigation between subscriptions cards.
---
htdocs/adherents/adherent.class.php | 5 ++-
htdocs/adherents/adherent_options.class.php | 8 ++---
htdocs/adherents/adherent_type.class.php | 28 +++++++--------
htdocs/adherents/card_subscriptions.php | 2 +-
htdocs/adherents/cotisation.class.php | 34 ++++++++++---------
htdocs/adherents/cotisations.php | 2 +-
htdocs/adherents/fiche.php | 2 +-
htdocs/adherents/fiche_subscription.php | 10 +++---
htdocs/adherents/htpasswd.php | 2 +-
htdocs/adherents/index.php | 2 +-
htdocs/adherents/info_subscription.php | 12 +++----
htdocs/adherents/ldap.php | 2 +-
htdocs/adherents/liste.php | 2 +-
htdocs/adherents/note.php | 8 ++---
htdocs/adherents/options.php | 2 +-
htdocs/adherents/pre.inc.php | 8 ++---
htdocs/adherents/type.php | 4 +--
htdocs/includes/modules/modAdherent.class.php | 4 +--
htdocs/langs/fr_FR/members.lang | 12 +++----
19 files changed, 73 insertions(+), 76 deletions(-)
diff --git a/htdocs/adherents/adherent.class.php b/htdocs/adherents/adherent.class.php
index 997c84ff719..f9ac39441f1 100644
--- a/htdocs/adherents/adherent.class.php
+++ b/htdocs/adherents/adherent.class.php
@@ -22,7 +22,7 @@
/**
* \file htdocs/adherents/adherent.class.php
- * \ingroup adherent
+ * \ingroup member
* \brief Fichier de la classe permettant la gestion d'un adherent
* \version $Id$
*/
@@ -36,7 +36,6 @@ require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
* \class Adherent
* \brief Classe permettant la gestion d'un adherent
*/
-
class Adherent extends CommonObject
{
var $db;
@@ -571,7 +570,7 @@ class Adherent extends CommonObject
/**
- \brief Fonction qui met a jour le chp denormalise date fin adh�sion
+ \brief Fonction qui met a jour le chp denormalise date fin adh�sion
\param user Utilisateur qui realise la mise a jour
\return int <0 si KO, >0 si OK
*/
diff --git a/htdocs/adherents/adherent_options.class.php b/htdocs/adherents/adherent_options.class.php
index a68aaf6395d..152548dbfc3 100644
--- a/htdocs/adherents/adherent_options.class.php
+++ b/htdocs/adherents/adherent_options.class.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
- * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
+ * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
*
* 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
@@ -21,12 +21,8 @@
/**
* \file htdocs/adherents/adherent_options.class.php
- * \ingroup adherent
+ * \ingroup member
* \brief Fichier de la classe de gestion de la table des champs optionels adherents
- * \author Rodolphe Quiedville
- * \author Jean-Louis Bergamo
- * \author Sebastien Di Cintio
- * \author Benoit Mortier
* \version $Id$
*/
diff --git a/htdocs/adherents/adherent_type.class.php b/htdocs/adherents/adherent_type.class.php
index f529f049784..6fcadb9c0a8 100644
--- a/htdocs/adherents/adherent_type.class.php
+++ b/htdocs/adherents/adherent_type.class.php
@@ -18,19 +18,19 @@
*/
/**
- \file htdocs/adherents/adherent_type.class.php
- \ingroup adherent
- \brief Fichier de la classe g�rant les types d'adh�rents
- \author Rodolphe Quiedeville
- \version $Id$
+ * \file htdocs/adherents/adherent_type.class.php
+ * \ingroup member
+ * \brief Fichier de la classe gerant les types d'adherents
+ * \author Rodolphe Quiedeville
+ * \version $Id$
*/
require_once(DOL_DOCUMENT_ROOT."/commonobject.class.php");
/**
- \class AdherentType
- \brief Classe g�rant les types d'adh�rents
+ * \class AdherentType
+ * \brief Classe gerant les types d'adherents
*/
class AdherentType extends CommonObject
{
@@ -42,7 +42,7 @@ class AdherentType extends CommonObject
var $id;
var $libelle;
var $statut;
- var $cotisation; /**< Soumis � la cotisation */
+ var $cotisation; /**< Soumis � la cotisation */
var $vote; /**< droit de vote ? */
var $note; /**< commentaire */
var $mail_valid; /**< mail envoye lors de la validation */
@@ -51,7 +51,7 @@ class AdherentType extends CommonObject
/**
\brief AdherentType
- \param DB handler acc�s base de donn�es
+ \param DB handler acc�s base de donn�es
*/
function AdherentType($DB)
{
@@ -75,8 +75,8 @@ class AdherentType extends CommonObject
/**
- \brief Fonction qui permet de cr�er le status de l'adh�rent
- \param userid userid de l'adh�rent
+ \brief Fonction qui permet de cr�er le status de l'adh�rent
+ \param userid userid de l'adh�rent
\return > 0 si ok, < 0 si ko
*/
function create($userid)
@@ -102,7 +102,7 @@ class AdherentType extends CommonObject
/**
- \brief Met a jour en base donn�es du type
+ \brief Met a jour en base donn�es du type
\return > 0 si ok, < 0 si ko
*/
function update()
@@ -134,7 +134,7 @@ class AdherentType extends CommonObject
}
/**
- * \brief Fonction qui permet de supprimer le status de l'adh�rent
+ * \brief Fonction qui permet de supprimer le status de l'adh�rent
* \param rowid
*/
function delete($rowid)
@@ -161,7 +161,7 @@ class AdherentType extends CommonObject
}
/**
- \brief Fonction qui permet de r�cup�rer le status de l'adh�rent
+ \brief Fonction qui permet de r�cup�rer le status de l'adh�rent
\param rowid
\return int <0 si KO, >0 si OK
*/
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index 126b95dbf81..1609bd550ad 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/card_subscriptions.php
- * \ingroup adherent
+ * \ingroup member
* \brief Onglet d'ajout, edition, suppression des adh�sions d'un adh�rent
* \version $Id$
*/
diff --git a/htdocs/adherents/cotisation.class.php b/htdocs/adherents/cotisation.class.php
index d08b6e77a45..7c523bd057a 100644
--- a/htdocs/adherents/cotisation.class.php
+++ b/htdocs/adherents/cotisation.class.php
@@ -18,23 +18,25 @@
*/
/**
- \file htdocs/adherents/cotisation.class.php
- \ingroup adherent
- \brief Fichier de la classe permettant de g�rer les cotisations
- \version $Id$
-*/
+ * \file htdocs/adherents/cotisation.class.php
+ * \ingroup member
+ * \brief File of class to manage subscriptions
+ * \version $Id$
+ */
/**
- \class Cotisation
- \brief Classe permettant de g�rer les cotisations
-*/
+ * \class Cotisation
+ * \brief Class to manage subscriptions
+ */
class Cotisation extends CommonObject
{
var $id;
var $db;
var $error;
var $errors;
+ var $element='subscription';
+ var $table_element='cotisation';
var $datec;
var $datem;
@@ -47,9 +49,9 @@ class Cotisation extends CommonObject
/**
- \brief Cotisation
- \param DB Handler base de donn�es
- */
+ * \brief Constructor
+ * \param DB Handler base de donnees
+ */
function Cotisation($DB)
{
$this->db = $DB;
@@ -57,10 +59,10 @@ class Cotisation extends CommonObject
/**
- \brief Fonction qui permet de cr�er le don
- \param userid userid de celui qui insere
- \return int <0 si KO, Id cotisation cr�� si OK
- */
+ * \brief Fonction qui permet de creer la cotisation
+ * \param userid userid de celui qui insere
+ * \return int <0 si KO, Id cotisation cree si OK
+ */
function create($userid)
{
// Check parameters
@@ -92,7 +94,7 @@ class Cotisation extends CommonObject
/**
- \brief Fonction qui permet de r�cup�rer une cotisation
+ \brief Fonction qui permet de r�cup�rer une cotisation
\param rowid Id cotisation
\return int <0 si KO, =0 si OK mais non trouve, >0 si OK
*/
diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php
index 07367ef80ea..befea39d5b2 100644
--- a/htdocs/adherents/cotisations.php
+++ b/htdocs/adherents/cotisations.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/cotisations.php
- * \ingroup adherent
+ * \ingroup member
* \brief Page de consultation et insertion d'une cotisation
* \version $Id$
*/
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index d57b37c57ce..c1d1dc2c3f3 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/fiche.php
- * \ingroup adherent
+ * \ingroup member
* \brief Page d'ajout, edition, suppression d'une fiche adherent
* \version $Id$
*/
diff --git a/htdocs/adherents/fiche_subscription.php b/htdocs/adherents/fiche_subscription.php
index 0a4524141cf..25de8c39634 100644
--- a/htdocs/adherents/fiche_subscription.php
+++ b/htdocs/adherents/fiche_subscription.php
@@ -18,8 +18,8 @@
/**
* \file htdocs/adherents/fiche_subscription.php
- * \ingroup adherent
- * \brief Page d'ajout, edition, suppression d'une fiche adh�sion
+ * \ingroup member
+ * \brief Page d'ajout, edition, suppression d'une fiche adh�sion
* \version $Id$
*/
@@ -147,7 +147,7 @@ if ($_REQUEST["action"] == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' &&
* View
*/
-llxHeader();
+llxHeader('',$langs->trans("SubscriptionCard"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros');
$form = new Form($db);
@@ -287,11 +287,11 @@ if ($rowid && $action != 'edit')
$head[$h][2] = 'info';
$h++;
- dol_fiche_head($head, 'general', $langs->trans("Subscription"));
+ dol_fiche_head($head, 'general', $langs->trans("Subscription"), '', 'payment');
if ($msg) print '<div class="error">'.$msg.'</div>';
- // Confirmation de la suppression de l'adh�rent
+ // Confirmation to delete subscription
if ($action == 'delete')
{
//$formquestion=array();
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index d774806960e..1ef487e5751 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -20,7 +20,7 @@
/**
\file htdocs/adherents/htpasswd.php
- \ingroup adherent
+ \ingroup member
\brief Page d'export htpasswd du fichier des adherents
\author Rodolphe Quiedeville
\version $Id$
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index ab07fd55327..a58c2fbe8ce 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/index.php
- * \ingroup adherent
+ * \ingroup member
* \brief Page accueil module adherents
*/
diff --git a/htdocs/adherents/info_subscription.php b/htdocs/adherents/info_subscription.php
index fffe097f11f..84aad2a88b1 100644
--- a/htdocs/adherents/info_subscription.php
+++ b/htdocs/adherents/info_subscription.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2005-2006 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -18,10 +18,10 @@
*/
/**
- \file htdocs/adherents/info.php
- \ingroup member
- \brief Page des informations d'un adherent
- \version $Id$
+ * \file htdocs/adherents/info.php
+ * \ingroup member
+ * \brief Page des informations d'un adherent
+ * \version $Id$
*/
require("./pre.inc.php");
@@ -68,7 +68,7 @@ $head[$h][2] = 'info';
$h++;
-dol_fiche_head($head, 'info', $langs->trans("Subscription"));
+dol_fiche_head($head, 'info', $langs->trans("Subscription"), '', 'payment');
$subscription->info($rowid);
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 588a4207bb3..abe56f388d1 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -19,7 +19,7 @@
/**
* \file htdocs/adherents/ldap.php
- * \ingroup ldap
+ * \ingroup ldap member
* \brief Page fiche LDAP adherent
* \version $Id$
*/
diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php
index a5538215665..9c35e6b4d46 100644
--- a/htdocs/adherents/liste.php
+++ b/htdocs/adherents/liste.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/liste.php
- * \ingroup adherent
+ * \ingroup member
* \brief Page to list all members of foundation
* \version $Id$
*/
diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php
index 3081088c0e3..779672a6eca 100644
--- a/htdocs/adherents/note.php
+++ b/htdocs/adherents/note.php
@@ -18,10 +18,10 @@
*/
/**
- \file htdocs/adherents/note.php
- \ingroup member
- \brief Fiche de notes sur un adherent
- \version $Id$
+ * \file htdocs/adherents/note.php
+ * \ingroup member
+ * \brief Fiche de notes sur un adherent
+ * \version $Id$
*/
require("./pre.inc.php");
diff --git a/htdocs/adherents/options.php b/htdocs/adherents/options.php
index d331aed5438..53481fb479a 100644
--- a/htdocs/adherents/options.php
+++ b/htdocs/adherents/options.php
@@ -20,7 +20,7 @@
/**
* \file htdocs/adherents/options.php
- * \ingroup adherent
+ * \ingroup member
* \brief Page de configuratin des champs optionnels
* \version $Id$
*/
diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php
index 05eabb1c932..3b481a976e5 100644
--- a/htdocs/adherents/pre.inc.php
+++ b/htdocs/adherents/pre.inc.php
@@ -18,10 +18,10 @@
*/
/** \file htdocs/adherents/pre.inc.php
- \ingroup adherent
- \brief Fichier de gestion du menu gauche du module adherent
- \version $Id$
-*/
+ * \ingroup member
+ * \brief Fichier de gestion du menu gauche du module adherent
+ * \version $Id$
+ */
require("../main.inc.php");
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index c6286d55bf8..4ca0a57c258 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -20,8 +20,8 @@
/**
* \file htdocs/adherents/type.php
- * \ingroup adherent
- * \brief Page de configuration des types d'adh�rents
+ * \ingroup member
+ * \brief Page de configuration des types d'adherents
* \version $Id$
*/
diff --git a/htdocs/includes/modules/modAdherent.class.php b/htdocs/includes/modules/modAdherent.class.php
index e0aa1ea3ff7..efd589a4c95 100644
--- a/htdocs/includes/modules/modAdherent.class.php
+++ b/htdocs/includes/modules/modAdherent.class.php
@@ -27,8 +27,8 @@
/**
* \file htdocs/includes/modules/modAdherent.class.php
- * \ingroup adherent
- * \brief Fichier de description et activation du module adherents
+ * \ingroup member
+ * \brief File descriptor or module Member
* \version $Id$
*/
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 9371a347454..971eeb3cdc7 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -3,7 +3,7 @@ CHARSET=UTF-8
MembersArea=Espace adhérents
PublicMembersArea=Espace public des adhérents
MemberCard=Fiche adhérent
-SubscriptionCard=Fiche adhésion
+SubscriptionCard=Fiche cotisation
Member=Adhérent
Members=Adhérents
ShowMember=Afficher fiche adhérent
@@ -77,14 +77,14 @@ NewAttribute=Nouvel attribut
AttributeCode=Code de l'attribut
OptionalFieldsSetup=Configuration des champs optionnels
MembersTypeSetup=Configuration des types d'adhérents
-NewSubscription=Nouvelle adhésion
-Subscription=Adhésion
-Subscriptions=Adhésions
+NewSubscription=Nouvelle cotisation
+Subscription=Cotisation
+Subscriptions=Cotisations
SubscriptionLate=En retard
-SubscriptionNotReceived=Adhésion non reçue
+SubscriptionNotReceived=Cotisation non reçue
SubscriptionLateShort=En retard
SubscriptionNotReceivedShort=Non reçue
-ListOfSubscriptions=Liste des adhésions
+ListOfSubscriptions=Liste des cotisations
SendCardByMail=Envoyer fiche
AddMember=Ajouter adhérent
MemberType=Type d'adhérent
--
GitLab