diff --git a/htdocs/adherents/pre.inc.php b/htdocs/adherents/pre.inc.php index 3aea22e3c4e..21b1d9aff0e 100644 --- a/htdocs/adherents/pre.inc.php +++ b/htdocs/adherents/pre.inc.php @@ -19,13 +19,7 @@ * $Source$ * */ -require("../../main.inc.php3"); -require("../../projetdon.class.php"); - -$libelle[0] = "Promesses non validées"; -$libelle[1] = "Promesses validées"; -$libelle[2] = "Dons payés"; -$libelle[3] = "Dons encaissés"; +require("../main.inc.php3"); function llxHeader($head = "") { global $user, $conf; @@ -39,10 +33,13 @@ function llxHeader($head = "") { $menu = new Menu(); - $menu->add("/compta/dons/","Dons"); - $menu->add_submenu("fiche.php?action=create","Saisir un don"); + $menu->add("index.php","Adherents"); + $menu->add_submenu("liste.php","liste"); + $menu->add_submenu("fiche.php?action=create","nouvel adhérent"); - $menu->add("/compta/bank/index.php3","Bank"); + $menu->add("cotisations.php","Cotisations"); + + $menu->add("type.php","Configuration"); left_menu($menu->liste); diff --git a/mysql/tables/llx_adherent_type.sql b/mysql/tables/llx_adherent_type.sql index dc3dd04ac04..6b676dab1f1 100644 --- a/mysql/tables/llx_adherent_type.sql +++ b/mysql/tables/llx_adherent_type.sql @@ -28,5 +28,6 @@ create table llx_adherent_type tms timestamp, statut smallint NOT NULL DEFAULT 0, libelle varchar(50), + cotisation enum('yes','no') NOT NULL DEFAULT 'yes', note text );