From bca5826c5485e2c1f3d8cfdf36f247826ea4afed Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Tue, 12 Aug 2008 16:37:02 +0000
Subject: Merging fix for bug 1974974

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2250 4979c152-3d1c-0410-bac9-87ea11338e46
---
 UI/payments/payments_detail.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'UI/payments/payments_detail.html')

diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html
index 206d0d59..6fabf8ca 100644
--- a/UI/payments/payments_detail.html
+++ b/UI/payments/payments_detail.html
@@ -198,7 +198,8 @@
 		ELSE ; 'name_has_no_vouchers' ; 
 		END
 		?>"><?lsmb r.contact_name ?></span></td>
-	<td class="invoice"><?lsmb r.total_due ?> <?lsmb currency ?></td>
+	<td class="invoice"><?lsmb INCLUDE format_money number=r.total_due ?> 
+		<?lsmb currency ?></td>
         <td class="payment" class="details_select">
 		<?lsmb INCLUDE input element_data = {
 		name = "paid_$r.contact_id"
@@ -293,12 +294,10 @@
 			value = icount
 		} ?>
 		<?lsmb IF !r.unselected;
-			IF (${"paid_$r.contact_id"} == 'all');
-				grand_total = grand_total + r.total_due;
-			ELSIF (${"paid_$r.contact_id"} == 'some');
+			IF (${"paid_$r.contact_id"} == 'some');
 				grand_total = grand_total + contact_total;
 			ELSE;
-				contact_total = 'error';
+				grand_total = grand_total + r.total_due;
 			END; # IF (paid...)
 		END # IF !r.unselected) ?>
 		<tr class="subtotal">
-- 
cgit v1.2.3