lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix sur le lien vers la fiche utilisateur

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2006-11-18 13:57:59 +00:00
parent 7ffc7aab6d
commit f26425bdc7
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
htdocs/compta/recap-compta.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -21,10 +21,10 @@
*/ */
/** /**
\file htdocs/compta/recap-compta.php \file htdocs/compta/recap-compta.php
\ingroup compta \ingroup compta
\brief Page de fiche recap compta \brief Page de fiche recap compta
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -44,8 +44,6 @@ if ($user->societe_id > 0)
$user->getrights('facture'); $user->getrights('facture');
/* /*
* *
* Mode fiche * Mode fiche
@ -66,7 +64,6 @@ if ($socid > 0)
dolibarr_fiche_head($head, 'compta', $societe->nom); dolibarr_fiche_head($head, 'compta', $societe->nom);
print "<table width=\"100%\">\n"; print "<table width=\"100%\">\n";
print '<tr><td valign="top" width="50%">'; print '<tr><td valign="top" width="50%">';
@ -96,7 +93,7 @@ if ($socid > 0)
$sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,"; $sql = "SELECT s.nom, s.idp, f.facnumber, f.amount, ".$db->pdate("f.datef")." as df,";
$sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,"; $sql.= " f.paye as paye, f.fk_statut as statut, f.rowid as facid,";
$sql.= " u.code"; $sql.= " u.code, u.rowid as userid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."user as u"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f,".MAIN_DB_PREFIX."user as u";
$sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id; $sql.= " WHERE f.fk_soc = s.idp AND s.idp = ".$societe->id;
$sql.= " AND f.fk_user_valid = u.rowid"; $sql.= " AND f.fk_user_valid = u.rowid";
@ -127,18 +124,18 @@ if ($socid > 0)
// Boucle sur chaque facture // Boucle sur chaque facture
for ($i = 0 ; $i < $num ; $i++) for ($i = 0 ; $i < $num ; $i++)
{ {
$objf = $db->fetch_object($resql); $objf = $db->fetch_object($resql);
$fac = new Facture($db); $fac = new Facture($db);
$ret=$fac->fetch($objf->facid); $ret=$fac->fetch($objf->facid);
if ($ret < 0) if ($ret < 0)
{ {
print $fac->error."<br>"; print $fac->error."<br>";
continue; continue;
} }
$totalpaye = $fac->getSommePaiement(); $totalpaye = $fac->getSommePaiement();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
@ -152,14 +149,14 @@ if ($socid > 0)
print '<td align="right">&nbsp;</td>'; print '<td align="right">&nbsp;</td>';
print '<td align="right">'.price($solde)."</td>\n"; print '<td align="right">'.price($solde)."</td>\n";
// Auteur // Auteur
print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->code.'</a></td>'; print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->code.'</a></td>';
print "</tr>\n"; print "</tr>\n";
// Paiements // Paiements
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut,"; $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, pf.amount, p.statut,";
$sql.= " p.fk_user_creat, u.code"; $sql.= " p.fk_user_creat, u.code, u.rowid as userid";
$sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf,"; $sql.= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf,";
$sql.= " ".MAIN_DB_PREFIX."paiement as p"; $sql.= " ".MAIN_DB_PREFIX."paiement as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_creat = u.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON p.fk_user_creat = u.rowid";
@ -188,7 +185,7 @@ if ($socid > 0)
print '<td align="right">'.price($solde)."</td>\n"; print '<td align="right">'.price($solde)."</td>\n";
// Auteur // Auteur
print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->code.'</a></td>'; print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->code.'</a></td>';
print '</tr>'; print '</tr>';