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

Fix: bug sur les requtes - Merci Laurent

Browse Source
This commit is contained in:
Regis Houssin 2007-09-20 18:48:18 +00:00
parent 571ee3b40d
commit 4876b36a53
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/compta/index.php
View File

@ -433,7 +433,7 @@ if ($user->rights->societe->lire)
}
else
{
print '<tr colspan="2" '.$bc[$var].'><td>'.$langs->trans("None").'</td></tr>';
print '<tr '.$bc[$var].'><td colspan="2">'.$langs->trans("None").'</td></tr>';
}
print '</table><br>';
}
@ -493,7 +493,7 @@ if ($user->rights->societe->lire)
}
else
{
print '<tr colspan="2" '.$bc[$var].'><td>'.$langs->trans("None").'</td></tr>';
print '<tr '.$bc[$var].'><td colspan="2">'.$langs->trans("None").'</td></tr>';
}
print '</table><br>';
}
@ -511,9 +511,9 @@ if ($conf->facture->enabled && $conf->commande->enabled && $user->rights->comman
$sql.= " s.nom, s.rowid as socid,";
$sql.= " p.rowid, p.ref, p.facture, p.fk_statut, p.total_ht, p.total_ttc";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM (".MAIN_DB_PREFIX."societe AS s, ".MAIN_DB_PREFIX."commande AS p";
if ($user->rights->commercial->client->voir || $socid) $sql .= ")";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc)";
$sql.= " FROM ".MAIN_DB_PREFIX."societe AS s";
if (!$user->rights->commercial->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."commande AS p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid";
$sql.= " WHERE p.fk_soc = s.rowid";

2
htdocs/includes/boxes/box_factures_imp.php
View File

@ -78,7 +78,7 @@ class box_factures_imp extends ModeleBoxes {
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql .= " WHERE f.fk_soc = s.rowid AND f.paye=0 AND fk_statut = 1";
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.idp = sc.fk_soc AND sc.fk_user = " .$user->id;
if (!$user->rights->commercial->client->voir && !$user->societe_id) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
if($user->societe_id)
{
$sql .= " AND s.rowid = ".$user->societe_id;