Modif scurit accs client
This commit is contained in:
Rodolphe Quiedeville
parent
fd4be51aa3
commit
81a6799218
@ -30,10 +30,11 @@ require("../facture.class.php");
|
|||||||
/*
|
/*
|
||||||
* Sécurité accés client
|
* Sécurité accés client
|
||||||
*/
|
*/
|
||||||
|
$socid = $_GET["socid"];
|
||||||
if ($user->societe_id > 0)
|
if ($user->societe_id > 0)
|
||||||
{
|
{
|
||||||
$action = '';
|
$action = '';
|
||||||
$socid = $user->societe_id;
|
$socid = $user->societe_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
$user->getrights('facture');
|
$user->getrights('facture');
|
||||||
@ -130,17 +131,15 @@ if ($mode == 'search')
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
* Mode fiche
|
* Mode fiche
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if ($_GET["socid"] > 0)
|
if ($socid > 0)
|
||||||
{
|
{
|
||||||
$societe = new Societe($db);
|
$societe = new Societe($db);
|
||||||
$societe->fetch($_GET["socid"], $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
|
$societe->fetch($socid, $to); // si $to='next' ajouter " AND s.idp > $socid ORDER BY idp ASC LIMIT 1";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Affichage onglets
|
* Affichage onglets
|
||||||
|
|||||||
@ -79,42 +79,47 @@ print "</table></form>";
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ($conf->facture->enabled) {
|
if ($conf->facture->enabled)
|
||||||
/*
|
|
||||||
* Factures brouillons
|
|
||||||
*/
|
|
||||||
|
|
||||||
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
|
|
||||||
|
|
||||||
if ( $db->query($sql) )
|
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
/*
|
||||||
$i = 0;
|
* Factures brouillons
|
||||||
|
*/
|
||||||
if ($num)
|
|
||||||
|
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s WHERE s.idp = f.fk_soc AND f.fk_statut = 0";
|
||||||
|
|
||||||
|
if ($socidp)
|
||||||
{
|
{
|
||||||
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
|
$sql .= " AND f.fk_soc = $socidp";
|
||||||
print '<tr class="liste_titre">';
|
|
||||||
print '<td colspan="2">Factures brouillons</td></tr>';
|
|
||||||
$var = True;
|
|
||||||
while ($i < $num)
|
|
||||||
{
|
|
||||||
$obj = $db->fetch_object( $i);
|
|
||||||
$var=!$var;
|
|
||||||
print '<tr '.$bc[$var].'><td width="92"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a> ';
|
|
||||||
print '<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
|
|
||||||
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</table><br>";
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
if ( $db->query($sql) )
|
||||||
{
|
{
|
||||||
print $sql;
|
$num = $db->num_rows();
|
||||||
}
|
$i = 0;
|
||||||
|
|
||||||
|
if ($num)
|
||||||
|
{
|
||||||
|
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
|
||||||
|
print '<tr class="liste_titre">';
|
||||||
|
print '<td colspan="2">Factures brouillons</td></tr>';
|
||||||
|
$var = True;
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$obj = $db->fetch_object( $i);
|
||||||
|
$var=!$var;
|
||||||
|
print '<tr '.$bc[$var].'><td width="92"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a> ';
|
||||||
|
print '<a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
|
||||||
|
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
print "</table><br>";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print $sql;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($conf->compta->enabled) {
|
if ($conf->compta->enabled) {
|
||||||
@ -238,53 +243,57 @@ if ($user->comm > 0 && $conf->commercial->enabled )
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($conf->facture->enabled) {
|
if ($conf->facture->enabled)
|
||||||
|
|
||||||
/*
|
|
||||||
* Factures impayées
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total_ttc, sum(pf.amount) as am";
|
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
|
|
||||||
$sql .= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
|
|
||||||
$sql .= " GROUP BY f.facnumber";
|
|
||||||
|
|
||||||
if ( $db->query($sql) )
|
|
||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
|
||||||
$i = 0;
|
/*
|
||||||
|
* Factures impayées
|
||||||
if ($num)
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
$sql = "SELECT f.facnumber, f.rowid, s.nom, s.idp, f.total_ttc, sum(pf.amount) as am";
|
||||||
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f left join ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
|
||||||
|
$sql .= " WHERE s.idp = f.fk_soc AND f.paye = 0 AND f.fk_statut = 1";
|
||||||
|
if ($socidp)
|
||||||
{
|
{
|
||||||
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
|
$sql .= " AND f.fk_soc = $socidp";
|
||||||
print '<tr class="liste_titre"><td colspan="2">Factures clients impayées</td><td align="right">Montant TTC</td><td align="right">Reçu</td></tr>';
|
|
||||||
$var = True;
|
|
||||||
$total = $totalam = 0;
|
|
||||||
while ($i < $num)
|
|
||||||
{
|
|
||||||
$obj = $db->fetch_object( $i);
|
|
||||||
$var=!$var;
|
|
||||||
print '<tr '.$bc[$var].'><td width="20%"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>';
|
|
||||||
print ' <a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
|
|
||||||
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
|
|
||||||
print '<td align="right">'.price($obj->total_ttc).'</td>';
|
|
||||||
print '<td align="right">'.price($obj->am).'</td></tr>';
|
|
||||||
$total += $obj->total_ttc;
|
|
||||||
$totalam += $obj->am;
|
|
||||||
$i++;
|
|
||||||
}
|
|
||||||
$var=!$var;
|
|
||||||
print '<tr '.$bc[$var].'><td colspan="2" align="left">Reste à encaisser : '.price($total-$totalam).'</td><td align="right">'.price($total).'</td><td align="right">'.price($totalam).'</td></tr>';
|
|
||||||
print "</table><br>";
|
|
||||||
}
|
}
|
||||||
$db->free();
|
$sql .= " GROUP BY f.facnumber";
|
||||||
}
|
|
||||||
else
|
if ( $db->query($sql) )
|
||||||
{
|
{
|
||||||
print $sql;
|
$num = $db->num_rows();
|
||||||
}
|
$i = 0;
|
||||||
|
|
||||||
|
if ($num)
|
||||||
|
{
|
||||||
|
print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">';
|
||||||
|
print '<tr class="liste_titre"><td colspan="2">Factures clients impayées</td><td align="right">Montant TTC</td><td align="right">Reçu</td></tr>';
|
||||||
|
$var = True;
|
||||||
|
$total = $totalam = 0;
|
||||||
|
while ($i < $num)
|
||||||
|
{
|
||||||
|
$obj = $db->fetch_object( $i);
|
||||||
|
$var=!$var;
|
||||||
|
print '<tr '.$bc[$var].'><td width="20%"><a href="facture.php?facid='.$obj->rowid.'">'.img_file().'</a>';
|
||||||
|
print ' <a href="facture.php?facid='.$obj->rowid.'">'.$obj->facnumber.'</a></td>';
|
||||||
|
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td>';
|
||||||
|
print '<td align="right">'.price($obj->total_ttc).'</td>';
|
||||||
|
print '<td align="right">'.price($obj->am).'</td></tr>';
|
||||||
|
$total += $obj->total_ttc;
|
||||||
|
$totalam += $obj->am;
|
||||||
|
$i++;
|
||||||
|
}
|
||||||
|
$var=!$var;
|
||||||
|
print '<tr '.$bc[$var].'><td colspan="2" align="left">Reste à encaisser : '.price($total-$totalam).'</td><td align="right">'.price($total).'</td><td align="right">'.price($totalam).'</td></tr>';
|
||||||
|
print "</table><br>";
|
||||||
|
}
|
||||||
|
$db->free();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
print $sql;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -22,10 +22,16 @@
|
|||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
llxHeader();
|
|
||||||
|
|
||||||
$mesg = '';
|
$mesg = '';
|
||||||
|
|
||||||
|
if ($user->societe_id > 0)
|
||||||
|
{
|
||||||
|
$action = '';
|
||||||
|
$socid = $user->societe_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
llxHeader();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
@ -73,6 +79,10 @@ if ($_GET["id"])
|
|||||||
$sql = "SELECT distinct(f.rowid), s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid";
|
$sql = "SELECT distinct(f.rowid), s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d WHERE f.fk_soc = s.idp";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."facturedet as d WHERE f.fk_soc = s.idp";
|
||||||
$sql .= " AND d.fk_facture = f.rowid AND d.fk_product =".$product->id;
|
$sql .= " AND d.fk_facture = f.rowid AND d.fk_product =".$product->id;
|
||||||
|
if ($socid)
|
||||||
|
{
|
||||||
|
$sql .= " AND f.fk_soc = $socid";
|
||||||
|
}
|
||||||
$sql .= " ORDER BY $sortfield $sortorder ";
|
$sql .= " ORDER BY $sortfield $sortorder ";
|
||||||
$sql .= $db->plimit( $limit ,$offset);
|
$sql .= $db->plimit( $limit ,$offset);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user