diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index abc917d765d..de871535956 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -30,7 +30,7 @@ require_once("./pre.inc.php"); require_once("../../don.class.php"); -require_once("../../paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); $langs->load("donations"); $langs->load("bills"); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 722c278096d..eada66dc361 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -39,12 +39,12 @@ accessforbidden(); $langs->load("bills"); require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); -require_once "../paiement.class.php"; +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/project.class.php"); if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT."/propal.class.php"); if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/contrat.class.php"); if ($conf->commande->enabled) require_once(DOL_DOCUMENT_ROOT."/commande/commande.class.php"); -require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php"); $sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"]; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 8d80ef6f93b..c62dd187b2a 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -29,8 +29,8 @@ */ require("./pre.inc.php"); -require_once DOL_DOCUMENT_ROOT."/facture.class.php"; -require_once DOL_DOCUMENT_ROOT."/paiement.class.php"; +require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); $user->getrights('facture'); $user->getrights('banque'); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 22b88cc2dff..0a78f5d9297 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -29,7 +29,7 @@ */ include_once("./pre.inc.php"); -include_once("../paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 329124ce65a..e272728a89d 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -28,10 +28,9 @@ \version $Revision$ */ - require("./pre.inc.php"); -require("../../paiement.class.php"); -include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/facture.class.php"); $user->getrights('facture'); diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index 98e91ecce9a..dcfcf799702 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -29,7 +29,7 @@ */ require("./pre.inc.php"); -require("../../paiement.class.php"); +require_once(DOL_DOCUMENT_ROOT."/paiement.class.php"); $langs->load("bills"); $langs->load("companies"); diff --git a/htdocs/public/adherents/new.php b/htdocs/public/adherents/new.php index f1467dd572e..459e1817b56 100644 --- a/htdocs/public/adherents/new.php +++ b/htdocs/public/adherents/new.php @@ -17,13 +17,18 @@ * * $Id$ * $Source$ - * */ + +/** + \file htdocs/public/adherents/new.php + \ingroup adherent + \brief Page liste des nouveaux adherents + \version $Revision$ +*/ + require("./pre.inc.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php"); -//require($GLOBALS["DOCUMENT_ROOT"]."/cotisation.class.php"); -//require($GLOBALS["DOCUMENT_ROOT"]."/paiement.class.php"); require(DOL_DOCUMENT_ROOT."/adherents/adherent_options.class.php"); $adho = new AdherentOptions($db); diff --git a/htdocs/public/adherents/priv_edit.php b/htdocs/public/adherents/priv_edit.php index 21f5af0dd04..be025aa4020 100644 --- a/htdocs/public/adherents/priv_edit.php +++ b/htdocs/public/adherents/priv_edit.php @@ -47,7 +47,7 @@ if ($action == 'update') // test some values // test si le login existe deja - $sql = "SELECT rowid,login FROM ".MAIN_DB_PREFIX."adherent WHERE login='$login';"; + $sql = "SELECT rowid,login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$user->login."';"; $result = $db->query($sql); if ($result) { $num = $db->num_rows(); @@ -131,7 +131,8 @@ if ($action == 'update') llxHeader(); -if (isset($user->login)){ +if (isset($user->login)) +{ $adh = new Adherent($db); $adh->login = $user->login; @@ -140,26 +141,12 @@ if (isset($user->login)){ // fetch optionals attibutes $adho->fetch_optionals(); - $sql = "SELECT s.nom,s.idp, f.amount, f.total, f.facnumber"; - $sql .= " FROM societe as s, ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = s.idp"; - $sql .= " AND f.rowid = $facid"; - - $result = $db->query($sql); - if ($result) { - $num = $db->num_rows(); - if ($num) { - $obj = $db->fetch_object( 0); - - $total = $obj->total; - } - } - $adht = new AdherentType($db); print_titre("Edition de la fiche adhérent de $adh->prenom $adh->nom"); if ($errmsg != ''){ - print ''; + print '
'; print ''; print "\n"; @@ -167,7 +154,7 @@ if (isset($user->login)){ print '
Erreur dans le formulaire
$errmsg
'; } - print ''; + print '
'; print ''; print ''; @@ -203,7 +190,7 @@ if (isset($user->login)){ print "
"; print ""; - print '
'.$langs->trans("Type").''.$adh->type.''.$langs->trans("Comments").'
'; + print '
'; print ""; print "id\">"; @@ -265,5 +252,5 @@ if (isset($user->login)){ $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?> diff --git a/htdocs/public/adherents/priv_liste.php b/htdocs/public/adherents/priv_liste.php index 0195dcfc373..4781aecea21 100644 --- a/htdocs/public/adherents/priv_liste.php +++ b/htdocs/public/adherents/priv_liste.php @@ -88,5 +88,5 @@ else $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>