Doc: Documentation doxygen
Fix: Passage du user la mthode addline de account.class
This commit is contained in:
parent
9b04300a6a
commit
c4cfa80f15
@ -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 "<table class=\"noborder\">\n";
|
||||
print '<tr class="liste_titre">';
|
||||
print "<td>Annee</td>";
|
||||
print '<td align="right">Montant</td>';
|
||||
print "<td align=\"right\">Nombre</td>";
|
||||
print "<td align=\"right\">Moyenne</td>\n";
|
||||
print '<td align="right">'.$langs->trans("Amount").'</td>';
|
||||
print '<td align="right">'.$langs->trans("Number").'</td>';
|
||||
print '<td align="right">'.$langs->trans("Average").'</td>';
|
||||
print "</tr>\n";
|
||||
|
||||
foreach ($Total as $key=>$value){
|
||||
$var=!$var;
|
||||
print "<tr $bc[$var]><td><A HREF=\"cotisations.php?statut=$statut&date_select=$key\">$key</A></TD><TD align=\"right\">".price($value)."</TD><TD align=\"right\">".$Number[$key]."</TD><TD align=\"right\">".price($value/$Number[$key])."</TD></TR>\n";
|
||||
print "<tr $bc[$var]><td><A HREF=\"cotisations.php?statut=$statut&date_select=$key\">$key</A></td><td align=\"right\">".price($value)."</td><td align=\"right\">".$Number[$key]."</td><td align=\"right\">".price($value/$Number[$key])."</td></tr>\n";
|
||||
}
|
||||
print "</table><br>\n";
|
||||
|
||||
@ -183,7 +183,7 @@ if ($result)
|
||||
print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".strftime("%d %B %Y",$objp->dateadh)."</a></td>\n";
|
||||
print '<td align="right">'.price($objp->cotisation).'</td>';
|
||||
$total+=price($objp->cotisation);
|
||||
print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></TD>\n";
|
||||
print "<td><a href=\"fiche.php?rowid=$objp->rowid&action=edit\">".stripslashes($objp->prenom)." ".stripslashes($objp->nom)."</a></td>\n";
|
||||
if (defined("ADHERENT_BANK_USE") && ADHERENT_BANK_USE !=0){
|
||||
if ($objp->bank !='' ){
|
||||
print "<td>Deposé</td>";
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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");
|
||||
|
||||
|
||||
@ -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"];
|
||||
|
||||
|
||||
@ -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"];
|
||||
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user