Mise aux normes

This commit is contained in:
Rodolphe Quiedeville 2005-04-04 11:56:26 +00:00
parent 5e215b7d44
commit 809661bcaf
2 changed files with 25 additions and 30 deletions

View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2005 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
@ -22,10 +22,10 @@
*/ */
/** /**
\file htdocs/compta/paiement/liste.php \file htdocs/compta/paiement/liste.php
\ingroup compta \ingroup compta
\brief Page liste des paiements des factures clients \brief Page liste des paiements des factures clients
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -43,33 +43,33 @@ if ($user->societe_id > 0)
* Affichage * Affichage
*/ */
llxHeader(); llxHeader('',$langs->trans("ListPayment"));
$page=$_GET["page"]; $page=$_GET["page"];
$sortorder=$_GET["sortorder"]; $sortorder=$_GET["sortorder"];
$sortfield=$_GET["sortfield"]; $sortfield=$_GET["sortfield"];
if ($page == -1)
$page = 0 ;
$limit = $conf->liste_limit; $limit = $conf->liste_limit;
$offset = $limit * $page ; $offset = $limit * $page ;
if (! $sortorder) $sortorder="DESC"; if (! $sortorder) $sortorder="DESC";
if (! $sortfield) $sortfield="p.rowid"; if (! $sortfield) $sortfield="p.rowid";
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount, p.statut"; $sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount";
$sql .=", c.libelle as paiement_type, p.num_paiement"; $sql .=", p.statut, p.num_paiement";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as c"; $sql .=", c.libelle as paiement_type";
$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
$sql .= " , ".MAIN_DB_PREFIX."c_paiement as c";
$sql .= " WHERE p.fk_paiement = c.id"; $sql .= " WHERE p.fk_paiement = c.id";
$sql .= " ORDER BY $sortfield $sortorder"; $sql .= " ORDER BY $sortfield $sortorder";
$sql .= $db->plimit( $limit +1 ,$offset); $sql .= $db->plimit( $limit +1 ,$offset);
$result = $db->query($sql);
if ($result) $resql = $db->query($sql);
if ($resql)
{ {
$num = $db->num_rows(); $num = $db->num_rows($resql);
$i = 0; $i = 0;
$var=True; $var=True;
@ -86,7 +86,7 @@ if ($result)
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object($result); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_file().' '.$objp->rowid.'</td>'; print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_file().' '.$objp->rowid.'</td>';
@ -101,11 +101,10 @@ if ($result)
} }
else else
{ {
print "-"; print img_tick();
} }
print '</td>'; print '</td></tr>';
print "</tr>";
$i++; $i++;
} }
print "</table>"; print "</table>";

View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005 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,16 +21,12 @@
* *
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
$langs->load("bills");
function llxHeader($head = "") { function llxHeader($head = "", $title="") {
global $user, $conf, $langs; global $user, $langs;
top_menu($head, $title);
/*
*
*
*/
top_menu($head);
$menu = new Menu(); $menu = new Menu();
@ -38,7 +34,7 @@ function llxHeader($head = "") {
$menu->add("rapport.php","Rapports"); $menu->add("rapport.php","Rapports");
$menu->add("../facture.php",$langs->trans("Bills")); $menu->add(DOL_URL_ROOT."/compta/facture.php",$langs->trans("Bills"));
$menu->add_submenu("liste.php",$langs->trans("Payments")); $menu->add_submenu("liste.php",$langs->trans("Payments"));
$menu->add_submenu("avalider.php",$langs->trans("A valider")); $menu->add_submenu("avalider.php",$langs->trans("A valider"));