diff --git a/htdocs/adherents/cotisations.php b/htdocs/adherents/cotisations.php index 0bef346136b..cfb2b89f033 100644 --- a/htdocs/adherents/cotisations.php +++ b/htdocs/adherents/cotisations.php @@ -65,7 +65,7 @@ if ($_POST["action"] == '2bank' && $_POST["rowid"] !=''){ $objp = $db->fetch_object($result); $amount=$objp->cotisation; $acct=new Account($db,ADHERENT_BANK_ACCOUNT); - $insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE); + $insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE,$user); if ($insertid == '') { dolibarr_print_error($db); @@ -147,14 +147,14 @@ if ($result) print "\n"; print ''; print ""; - print ''; - print ""; - print "\n"; + print ''; + print ''; + print ''; print "\n"; foreach ($Total as $key=>$value){ $var=!$var; - print "\n"; + print "\n"; } print "
AnneeMontantNombreMoyenne'.$langs->trans("Amount").''.$langs->trans("Number").''.$langs->trans("Average").'
$key".price($value)."".$Number[$key]."".price($value/$Number[$key])."
$key".price($value)."".$Number[$key]."".price($value/$Number[$key])."

\n"; @@ -183,7 +183,7 @@ if ($result) print "rowid&action=edit\">".strftime("%d %B %Y",$objp->dateadh)."\n"; print ''.price($objp->cotisation).''; $total+=price($objp->cotisation); - print "rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."\n"; + print "rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."\n"; if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){ if ($objp->bank !='' ){ print "Deposé"; diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index df1e5887143..77fd22715ad 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -78,7 +78,7 @@ if ($_POST["action"] == 'cotisation') //$dateop="$reyear$remonth$reday"; $amount=$cotisation; $acct=new Account($db,ADHERENT_BANK_ACCOUNT); - $insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE); + $insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE,$user); if ($insertid == '') { dolibarr_print_error($db); diff --git a/htdocs/compta/bank/account.class.php b/htdocs/compta/bank/account.class.php index d1b421783b4..fd53112bbf0 100644 --- a/htdocs/compta/bank/account.class.php +++ b/htdocs/compta/bank/account.class.php @@ -125,12 +125,12 @@ class Account return $lines; } } - /* - * Ajoute une entree dans la table ".MAIN_DB_PREFIX."bank - * + + /** + * \brief Ajoute une entree dans la table ".MAIN_DB_PREFIX."bank + * \return int rowid de l'entrée ajoutée */ - // FIXME function addline($date, $oper, $label, $amount, $num_chq='', $categorie='',$user) - function addline($date, $oper, $label, $amount, $num_chq='', $categorie='') + function addline($date, $oper, $label, $amount, $num_chq='', $categorie='', $user='') { if ($this->rowid) { diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 12d2fe5b049..96fe2695233 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -21,19 +21,23 @@ * $Source$ * */ -require("../../main.inc.php"); -require("./account.class.php"); + +/*! + \file htdocs/compta/bank/pre.inc.php + \ingroup compta + \brief Fichier gestionnaire du menu compta banque +*/ + +require_once("../../main.inc.php"); +require_once("./account.class.php"); $user->getrights('banque'); + function llxHeader($head = "") { - global $db, $user, $conf, $account; + global $db, $user, $conf; - /* - * - * - */ top_menu($head); $menu = new Menu(); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 31b8a336acd..2ba3e5d1520 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -22,7 +22,7 @@ * */ -/*! \file htdocs/compta/facture.php +/*! \file htdocs/compta/facture.php \ingroup facture \brief Page de création d'une facture \version $Revision$ @@ -43,7 +43,6 @@ require("../lib/CMailFile.class.php"); require("../paiement.class.php"); require("../project.class.php"); require("../propal.class.php"); -require("./bank/account.class.php"); require("../contrat/contrat.class.php"); require("../commande/commande.class.php"); diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 8b5313bdaaf..15014fa3ae8 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -20,13 +20,18 @@ * $Source$ * */ + +/*! + \file htdocs/compta/paiement.php + \ingroup compta + \brief Page de création d'un paiement + \version $Revision$ +*/ + include_once("./pre.inc.php"); include_once("../paiement.class.php"); include_once(DOL_DOCUMENT_ROOT."/facture.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); -/* - * - */ $facid=isset($_GET["facid"])?$_GET["facid"]:$_POST["facid"]; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index aaab7c7b750..cc459b6a902 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -19,12 +19,17 @@ * $Source$ * */ + +/*! + \file htdocs/compta/paiement_charge.php + \ingroup compta + \brief Page de création d'un paiement d'une charge + \version $Revision$ +*/ + include_once("./pre.inc.php"); include_once("../chargesociales.class.php"); include_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); -/* - * - */ $chid=isset($_GET["id"])?$_GET["id"]:$_POST["id"]; diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 244a8f4b96c..9c963be51fc 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -20,7 +20,8 @@ * */ -/*! \file htdocs/compta/sociales/charges.php +/*! + \file htdocs/compta/sociales/charges.php \ingroup compta \brief Fiche d'une charge sociale \version $Revision$ @@ -38,7 +39,6 @@ if (!$user->admin && !$user->rights->compta->charges) accessforbidden(); require("../../chargesociales.class.php"); -require("../bank/account.class.php"); llxHeader(); diff --git a/htdocs/fourn/facture/paiementfourn.class.php b/htdocs/fourn/facture/paiementfourn.class.php index 387c14566c3..e832fb35a2a 100644 --- a/htdocs/fourn/facture/paiementfourn.class.php +++ b/htdocs/fourn/facture/paiementfourn.class.php @@ -20,6 +20,14 @@ * $Source$ * */ + +/*! + \file htdocs/fourn/facture/paiementfourn.class.php + \ingroup fournisseur, facture + \brief Page de création de paiement factures fournisseurs + \version $Revision$ +*/ + require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); class PaiementFourn diff --git a/htdocs/fourn/facture/pre.inc.php b/htdocs/fourn/facture/pre.inc.php index 8e3de70941a..3e61cfb1385 100644 --- a/htdocs/fourn/facture/pre.inc.php +++ b/htdocs/fourn/facture/pre.inc.php @@ -20,17 +20,19 @@ * $Source$ * */ + +/*! + \file htdocs/fourn/facture/pre.inc.php + \ingroup fournisseur,facture + \brief Fichier gestionnaire du menu factures fournisseurs +*/ + require("../../main.inc.php"); -include_once DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"; function llxHeader($head = "", $urlp = "") { global $user, $conf; - /* - * - * - */ top_menu($head); $menu = new Menu();