From 402aa6d56828b49d32b1fec4113cfb3106efffc5 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Fri, 22 Apr 2005 15:16:45 +0000 Subject: [PATCH] Gestion de l'ordonnancement des lignes --- htdocs/compta/facture.php | 82 ++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 26 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index adfaf0c82fc..de3d36747e8 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2002-2005 Rodolphe Quiedeville * Copyright (C) 2004 Éric Seigne * Copyright (C) 2004-2005 Laurent Destailleur * @@ -327,6 +327,21 @@ if ($_POST["action"] == 'confirm_canceled' && $_POST["confirm"] == yes) } } +/* + * Ordonnancement des lignes + */ + +if ($_GET["action"] == 'up' && $user->rights->facture->creer) +{ + $fac = new Facture($db,"",$_GET["facid"]); + $fac->line_up($_GET["rowid"]); +} + +if ($_GET["action"] == 'down' && $user->rights->facture->creer) +{ + $fac = new Facture($db,"",$_GET["facid"]); + $fac->line_down($_GET["rowid"]); +} /* * Action envoi de mail @@ -852,6 +867,7 @@ else if ($_GET["action"] == 'delete') { $html->form_confirm($_SERVER["PHP_SELF"]."?facid=$fac->id",$langs->trans("DeleteBill"),$langs->trans("ConfirmDeleteBill"),"confirm_delete"); + print '
'; } /* @@ -861,6 +877,7 @@ else if ($_GET["action"] == 'canceled') { $html->form_confirm($_SERVER["PHP_SELF"]."?facid=$fac->id","Classer la facture à l'état 'Abandonnée'","La totalité du paiement de cette facture n'a pas été réalisée. Etes-vous sûr de vouloir abandonner définitivement cette facture ?","confirm_canceled"); + print '
'; } /* @@ -871,6 +888,7 @@ else { $numfa = facture_get_num($soc); $html->form_confirm("facture.php?facid=$fac->id","Valider la facture sous la référence no ".$numfa,"Etes-vous sûr de vouloir valider cette facture avec la référence no $numfa ?","confirm_valid"); + print '
'; } /* @@ -1002,17 +1020,20 @@ else * Lignes de factures * */ - $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_taux, l.remise_percent, l.subprice,"; - $sql .= $db->pdate("l.date_start")." as date_start, ".$db->pdate("l.date_end")." as date_end, "; - $sql .= " p.fk_product_type"; - $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l LEFT JOIN ".MAIN_DB_PREFIX."product p ON l.fk_product=p.rowid"; + $sql = "SELECT l.fk_product, l.description, l.price, l.qty, l.rowid, l.tva_taux"; + $sql .= " , l.remise_percent, l.subprice,"; + $sql .= $db->pdate("l.date_start")." as date_start"; + $sql .= " , ".$db->pdate("l.date_end")." as date_end, "; + $sql .= " p.fk_product_type"; + $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as l "; + $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON l.fk_product=p.rowid"; $sql .= " WHERE l.fk_facture = ".$fac->id; - $sql .= " ORDER BY l.rowid"; + $sql .= " ORDER BY l.rang ASC, l.rowid"; - $result = $db->query($sql); - if ($result) + $resql = $db->query($sql); + if ($resql) { - $num_lignes = $db->num_rows($result); + $num_lignes = $db->num_rows($resql); $i = 0; $total = 0; print ''; @@ -1025,13 +1046,13 @@ else print ''; print ''; print ''; - print ''; + print ''; print "\n"; } $var=True; while ($i < $num_lignes) { - $objp = $db->fetch_object($result); + $objp = $db->fetch_object($resql); $var=!$var; print ""; if ($objp->fk_product > 0) @@ -1076,10 +1097,18 @@ else print ''; + + print ''; + } else { - print ''; + print ''; } print ""; @@ -1099,12 +1128,12 @@ else print ''; print ''; print ''; - print ''; + print ''; print '' . "\n"; if ($conf->service->enabled) { print ""; - print ''; print ''; print ''; + print ''; print "\n"; print ''; print ''; @@ -1156,10 +1186,10 @@ else print ''; print ''; print ''; - print ''; + print ''; if ($conf->service->enabled) { print ''; - print '"; print ''; @@ -1460,8 +1490,8 @@ else $sql = "SELECT ".$db->pdate("p.datep")." as dp, p.price, p.ref, p.rowid as propalid"; $sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."fa_pr as fp WHERE fp.fk_propal = p.rowid AND fp.fk_facture = $fac->id"; - $result = $db->query($sql); - if ($result) + $resql = $db->query($sql); + if ($resql) { $num = $db->num_rows(); if ($num) @@ -1600,9 +1630,9 @@ else $sql .= $db->plimit($limit+1,$offset); - $result = $db->query($sql); + $resql = $db->query($sql); - if ($result) + if ($resql) { $num = $db->num_rows(); @@ -1653,7 +1683,7 @@ else while ($i < min($num,$limit)) { - $objp = $db->fetch_object($result); + $objp = $db->fetch_object($resql); $var=!$var; print ""; @@ -1739,7 +1769,7 @@ else } print "
'.$langs->trans("Qty").''.$langs->trans("Discount").''.$langs->trans("AmountHT").'   
'; print img_delete(); print ''; + print ''; + print img_up(); + print ''; + print img_down(); + print '   
 %

Si produit de type service à durée limitée: Du '; + print 'Si produit de type service à durée limitée: Du '; print $html->select_date($objp->date_start,"date_start",0,0,$objp->date_start?0:1); print ' au '; print $html->select_date($objp->date_end,"date_end",0,0,$objp->date_end?0:1); @@ -1142,6 +1171,7 @@ else print '    
%
Si produit de type service à durée limitée: Du '; + print 'Si produit de type service à durée limitée: Du '; print $html->select_date('',"date_start",0,0,1); print ' au '; print $html->select_date('',"date_end",0,0,1); @@ -1322,10 +1352,10 @@ else $sql .= " AND a.fk_soc = ".$fac->socidp ; $sql .= " AND a.fk_facture = ".$fac->id; - $result = $db->query($sql); - if ($result) + $resql = $db->query($sql); + if ($resql) { - $num = $db->num_rows($result); + $num = $db->num_rows($resql); if ($num) { print_titre($langs->trans("ActionsOnBill")); @@ -1338,7 +1368,7 @@ else $var=True; while ($i < $num) { - $objp = $db->fetch_object($result); + $objp = $db->fetch_object($resql); $var=!$var; print "
'.img_object($langs->trans("ShowTask"),"task").' '.$objp->id.'
"; - $db->free($result); + $db->free($resql); } else {