Skip to content
Snippets Groups Projects
Commit a1e47231 authored by Rodolphe Quiedeville's avatar Rodolphe Quiedeville
Browse files

Mise en conformité avec la nouvelle structure de la base

parent 1cd42ae0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/compta/prelevement/fiche-rejet.php
+ 19
− 45
View file @ a1e47231
......@@ -37,6 +37,10 @@ $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Fiche");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Lignes");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Factures");
$h++;
......@@ -76,46 +80,28 @@ if ($_GET["id"])
}
$page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
if ($sortorder == "") {
$sortorder="DESC";
}
if ($sortfield == "") {
$sortfield="p.datec";
}
/*
* Liste des factures
*
*
*/
$sql = "SELECT pf.rowid, pf.statut";
$sql .= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
$sql = "SELECT pl.rowid, pl.amount, pl.statut";
$sql .= " , s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE p.rowid=".$prev_id;
$sql .= " AND pf.fk_prelevement = p.rowid";
$sql .= " AND f.fk_soc = s.idp";
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND pf.statut = 2 ";
$sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND pl.fk_soc = s.idp";
$sql .= " AND pl.statut = 3 ";
if ($_GET["socid"])
{
$sql .= " AND s.idp = ".$_GET["socid"];
}
$sql .= " ORDER BY $sortfield $sortorder " . $db->plimit($conf->liste_limit+1, $offset);
$sql .= " ORDER BY pl.amount DESC";
$result = $db->query($sql);
if ($result)
......@@ -123,41 +109,29 @@ if ($result)
$num = $db->num_rows();
$i = 0;
$urladd = "&id=".$_GET["id"];
print_barre_liste("Factures", $page, "factures.php", $urladd, $sortfield, $sortorder, '', $num);
print_barre_liste("Lignes de prlvement rejetes", $page, "fiche-rejet.php", $urladd, $sortfield, $sortorder, '', $num);
print"\n<!-- debut table -->\n";
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">';
print_liste_field_titre("Facture","factures.php","p.ref",'',$urladd);
print_liste_field_titre("Socit","factures.php","s.nom",'',$urladd);
print_liste_field_titre("Montant","factures.php","f.total_ttc","",$urladd,'align="center"');
print '<td colspan="2">&nbsp;</td></tr>';
print '<td>Ligne</td><td>Socit</td><td align="right">Montant</td></tr>';
$var=True;
$total = 0;
while ($i < min($num,$conf->liste_limit))
while ($i < $num)
{
$obj = $db->fetch_object($i);
print "<tr $bc[$var]><td>";
print '<img border="0" src="./statut'.$obj->statut.'.png"></a>&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_file();
print '</a>&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
print substr('000000'.$obj->rowid, -6);
print '</a></td>';
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->idp.'">'.stripslashes($obj->nom)."</a></td>\n";
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
print '<td><b>Rejet</b></td><td>';
print '</td>';
print '<td align="right">'.price($obj->amount)."</td>\n";
print "</tr>\n";
$total += $obj->total_ttc;
......
htdocs/compta/prelevement/fiche-stat.php
+ 16
− 9
View file @ a1e47231
......@@ -33,6 +33,10 @@ $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Fiche");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Lignes");
$h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Factures");
$h++;
......@@ -71,12 +75,11 @@ if ($prev_id)
* Stats
*
*/
$sql = "SELECT sum(f.total_ttc), pf.statut";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " WHERE pf.fk_prelevement = ".$prev_id;
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " GROUP BY pf.statut";
$sql = "SELECT sum(pl.amount), pl.statut";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " WHERE pl.fk_prelevement_bons = ".$prev_id;
$sql .= " GROUP BY pl.statut";
if ($db->query($sql))
{
......@@ -96,15 +99,19 @@ if ($prev_id)
print "<tr $bc[$var]><td>";
if ($row[1] == 1)
if ($row[1] == 2)
{
print 'Crdit';
}
elseif ($row[1] == 2)
elseif ($row[1] == 3)
{
print 'Rejet';
}
elseif ($row[1] == 1)
{
print 'En attente';
}
print '</td><td align="right">';
print price($row[0]);
......
htdocs/compta/prelevement/rejets.php
+ 14
− 37
View file @ a1e47231
......@@ -57,35 +57,29 @@ $page = $_GET["page"];
$sortorder = $_GET["sortorder"];
$sortfield = $_GET["sortfield"];
if ($page == -1) { $page = 0 ; }
$offset = $conf->liste_limit * $page ;
$pageprev = $page - 1;
$pagenext = $page + 1;
if ($sortorder == "") {
$sortorder="DESC";
}
if ($sortfield == "") {
$sortfield="p.datec";
}
if ($sortorder == "") $sortorder="DESC";
if ($sortfield == "") $sortfield="p.datec";
$rej = new RejetPrelevement($db, $user);
/*
* Liste des factures
*
*
*/
$sql = "SELECT p.rowid, pf.statut, p.ref";
$sql .= " ,f.rowid as facid, f.facnumber, f.total_ttc";
$sql = "SELECT p.rowid, pr.motif, p.ref";
$sql .= " , s.idp, s.nom";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
$sql .= " , ".MAIN_DB_PREFIX."facture as f";
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_rejet as pr";
$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= " , ".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE pf.fk_prelevement = p.rowid";
$sql .= " AND f.fk_soc = s.idp";
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND pf.statut = 2 ";
$sql .= " WHERE pr.fk_prelevement_lignes = pl.rowid";
$sql .= " AND pl.fk_prelevement_bons = p.rowid";
$sql .= " AND pl.fk_soc = s.idp";
if ($_GET["socid"])
{
......@@ -105,10 +99,9 @@ if ($result)
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">';
print_liste_field_titre("Bon N","rejets.php","p.ref",'',$urladd);
print_liste_field_titre("Facture","rejets.php","p.facnumber",'',$urladd);
print_liste_field_titre("Socit","rejets.php","s.nom",'',$urladd);
print_liste_field_titre("Montant","rejets.php","f.total_ttc","",$urladd,'align="center"');
print '<td colspan="2">&nbsp;</td></tr>';
print_liste_field_titre("Motif","rejets.php","pr.motif","",$urladd);
print '</tr>';
$var=True;
......@@ -122,26 +115,10 @@ if ($result)
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$obj->rowid.'">'.$obj->ref."</a></td>\n";
print "<td>";
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">';
print img_file();
print '</a>&nbsp;';
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->idp.'">'.stripslashes($obj->nom)."</a></td>\n";
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
print '<td><b>Rejet</b></td><td>';
print '</td>';
print '<td>'.$rej->motifs[$obj->motif].'</td>';
print "</tr>\n";
$total += $obj->total_ttc;
$var=!$var;
$i++;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment