mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-02-20 13:46:52 +01:00
New: Add navigation between subscriptions cards.
This commit is contained in:
Laurent Destailleur
parent
6b2a782468
commit
cdce5fa436
|
|
@ -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<EFBFBD>sion
|
||||
\param user Utilisateur qui realise la mise a jour
|
||||
\return int <0 si KO, >0 si OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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$
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <EFBFBD> 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<EFBFBD>s base de donn<EFBFBD>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<EFBFBD>er le status de l'adh<EFBFBD>rent
|
||||
\param userid userid de l'adh<EFBFBD>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<EFBFBD>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<EFBFBD>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<EFBFBD>cup<EFBFBD>rer le status de l'adh<EFBFBD>rent
|
||||
\param rowid
|
||||
\return int <0 si KO, >0 si OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/card_subscriptions.php
|
||||
* \ingroup adherent
|
||||
* \ingroup member
|
||||
* \brief Onglet d'ajout, edition, suppression des adh<64>sions d'un adh<EFBFBD>rent
|
||||
* \version $Id$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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<EFBFBD>cup<EFBFBD>rer une cotisation
|
||||
\param rowid Id cotisation
|
||||
\return int <0 si KO, =0 si OK mais non trouve, >0 si OK
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/cotisations.php
|
||||
* \ingroup adherent
|
||||
* \ingroup member
|
||||
* \brief Page de consultation et insertion d'une cotisation
|
||||
* \version $Id$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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<EFBFBD>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();
|
||||
|
|
|
|||
|
|
@ -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$
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/index.php
|
||||
* \ingroup adherent
|
||||
* \ingroup member
|
||||
* \brief Page accueil module adherents
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/ldap.php
|
||||
* \ingroup ldap
|
||||
* \ingroup ldap member
|
||||
* \brief Page fiche LDAP adherent
|
||||
* \version $Id$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/liste.php
|
||||
* \ingroup adherent
|
||||
* \ingroup member
|
||||
* \brief Page to list all members of foundation
|
||||
* \version $Id$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/options.php
|
||||
* \ingroup adherent
|
||||
* \ingroup member
|
||||
* \brief Page de configuratin des champs optionnels
|
||||
* \version $Id$
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
|
||||
/**
|
||||
* \file htdocs/adherents/type.php
|
||||
* \ingroup adherent
|
||||
* \brief Page de configuration des types d'adh<EFBFBD>rents
|
||||
* \ingroup member
|
||||
* \brief Page de configuration des types d'adherents
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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$
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user