From feb7af490a8331eabb1f03998655cfc17fc8150b Mon Sep 17 00:00:00 2001
From: lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
Date: Wed, 5 Jun 2013 10:15:01 +0200
Subject: [PATCH 1/2] T943: Put the total of the priceat the bottom of the
 propal list

---
 htdocs/comm/propal/list.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 81306b47033..64e18262c78 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -203,7 +203,6 @@ if ($result)
 {
 	$objectstatic=new Propal($db);
 	$userstatic=new User($db);
-
 	$num = $db->num_rows($result);
 
  	if ($socid)
@@ -389,6 +388,15 @@ if ($result)
 
 		$i++;
 	}
+
+	if ($total>0)
+			{
+				$var=!$var;
+				print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT").'</td>';
+				print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
+				print '</tr>';
+			}
+	
 	print '</table>';
 
 	print '</form>';

From e8f26ad33b5c7d609a83f2e3a44823ffd6fe7d8a Mon Sep 17 00:00:00 2001
From: lalaina rasamoelina <lalaina.rasamoelina@biblibre.com>
Date: Tue, 18 Jun 2013 10:59:19 +0200
Subject: [PATCH 2/2] T943  If there is only one page, we keep label "Total
 HT", but if there is more than one page, we use "Total HT for this page"

---
 htdocs/comm/propal/list.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 64e18262c78..c9e0e436a72 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -391,10 +391,20 @@ if ($result)
 
 	if ($total>0)
 			{
-				$var=!$var;
-				print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT").'</td>';
-				print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
-				print '</tr>';
+				if($num<$limit){
+					$var=!$var;
+					print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT").'</td>';
+					print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '</tr>';
+				}
+				else
+				{
+					$var=!$var;
+					print '<tr class="liste_total"><td align="left">'.$langs->trans("Total HT for this page").'</td>';
+					print '<td colspan="5" align="right"">'.price($total).'<td colspan="3"</td>';
+					print '</tr>';
+				}
+					
 			}
 	
 	print '</table>';