Right aligned numbers, fixed rounding issue

www/finance-monthly-summary.tcl

@@ -18,6 +18,7 @@ ad_page_contract {
     project_id:integer,optional
     customer_id:integer,optional
     provider_id:integer,optional
+    { rounding_precision:integer 2}
 }
 
 # ------------------------------------------------------------
@@ -59,6 +60,8 @@ set page_title "Finance Monthly Summary"
 set context_bar [im_context_bar $page_title]
 set context ""
 
+set number_locale [lang::user::locale]
+
 
 # ------------------------------------------------------------
 # Defaults
@@ -218,11 +221,11 @@ set report_def [list \
 			$provider_nr
 			$effective_date_formatted
 			$cost_name
-			"<nobr>$paid_amount_pretty</nobr>"
-			"<nobr>$invoice_amount_pretty</nobr>"
-			"<nobr>$quote_amount_pretty</nobr>"
-			"<nobr>$bill_amount_pretty</nobr>"
-			"<nobr>$po_amount_pretty</nobr>"
+			"#align=right <nobr>$paid_amount_pretty</nobr>"
+			"#align=right <nobr>$invoice_amount_pretty</nobr>"
+			"#align=right <nobr>$quote_amount_pretty</nobr>"
+			"#align=right <nobr>$bill_amount_pretty</nobr>"
+			"#align=right <nobr>$po_amount_pretty</nobr>"
 		    } \
 		    content {} \
 	    ] \
@@ -232,11 +235,11 @@ set report_def [list \
                 "\#colspan=1 <nobr><a href=$this_url&effective_date=$effective_date_formatted&level_of_detail=3 target=_blank><img src=/intranet/images/plus_9.gif width=9 height=9 border=0></a>
                 <i>$effective_date_formatted</i></nobr>"
 		"" 
-		"<i>$paid_month_total $default_currency</i>" 
-		"<i>$invoice_month_total $default_currency</i>" 
-		"<i>$quote_month_total $default_currency</i>" 
-		"<i>$bill_month_total $default_currency</i>" 
-		"<i>$po_month_total $default_currency</i>"
+		"#align=right <i>$paid_month_total_pretty $default_currency</i>" 
+		"#align=right <i>$invoice_month_total_pretty $default_currency</i>" 
+		"#align=right <i>$quote_month_total_pretty $default_currency</i>" 
+		"#align=right <i>$bill_month_total_pretty $default_currency</i>" 
+		"#align=right <i>$po_month_total_pretty $default_currency</i>"
             } \
     ] \
     footer {
@@ -244,11 +247,11 @@ set report_def [list \
 	"" 
 	"" 
 	"<b>Subtotal:</b>" 
-	"<b>$paid_subtotal $default_currency</b>" 
-	"<b>$invoice_subtotal $default_currency</b>" 
-	"<b>$quote_subtotal $default_currency</b>" 
-	"<b>$bill_subtotal $default_currency</b>" 
-	"<b>$po_subtotal $default_currency</b>"
+	"#align=right <b>$paid_subtotal_pretty $default_currency</b>" 
+	"#align=right <b>$invoice_subtotal_pretty $default_currency</b>" 
+	"#align=right <b>$quote_subtotal_pretty $default_currency</b>" 
+	"#align=right <b>$bill_subtotal_pretty $default_currency</b>" 
+	"#align=right <b>$po_subtotal_pretty $default_currency</b>"
     } \
 ]
 
@@ -260,7 +263,17 @@ set po_total 0
 
 # Global header/footer
 set header0 {"Customer" "Provider" "Date" "Name" "Paid" "Invoice" "Quote" "Bill" "PO"}
-set footer0 {"" "" "" "<br><b>Total:</b>" "<br><b>$paid_total $default_currency</b>" "<br><b>$invoice_total $default_currency</b>" "<br><b>$quote_total $default_currency</b>" "<br><b>$bill_total $default_currency</b>" "<br><b>$po_total $default_currency</b>"}
+set footer0 {
+    "" 
+    "" 
+    "" 
+    "#align=right <br><b>Total:</b>" 
+    "#align=right <br><b>$paid_total_pretty $default_currency</b>"
+    "#align=right <br><b>$invoice_total_pretty $default_currency</b>"
+    "#align=right <br><b>$quote_total_pretty $default_currency</b>"
+    "#align=right <br><b>$bill_total_pretty $default_currency</b>"
+    "#align=right <br><b>$po_total_pretty $default_currency</b>"
+}
 
 # invoice_amount can be empty (null), so let's add "+0",
 # which gets translated in a "0" if invoice_amount _is_ ""
@@ -477,7 +490,25 @@ db_foreach sql $sql {
 	    -cell_class $class
 	
 	im_report_update_counters -counters $counters
-	
+
+	set paid_subtotal_pretty [lc_numeric $paid_subtotal %.${rounding_precision}f $number_locale]
+	set invoice_subtotal_pretty [lc_numeric $invoice_subtotal %.${rounding_precision}f $number_locale]
+	set quote_subtotal_pretty [lc_numeric $quote_subtotal %.${rounding_precision}f $number_locale]
+	set bill_subtotal_pretty [lc_numeric $bill_subtotal %.${rounding_precision}f $number_locale]
+	set po_subtotal_pretty [lc_numeric $po_subtotal %.${rounding_precision}f $number_locale]
+
+	set paid_total_pretty [lc_numeric $paid_total %.${rounding_precision}f $number_locale]
+	set invoice_total_pretty [lc_numeric $invoice_total %.${rounding_precision}f $number_locale]
+	set quote_total_pretty [lc_numeric $quote_total %.${rounding_precision}f $number_locale]
+	set bill_total_pretty [lc_numeric $bill_total %.${rounding_precision}f $number_locale]
+	set po_total_pretty [lc_numeric $po_total %.${rounding_precision}f $number_locale]
+
+	set paid_month_total_pretty [lc_numeric $paid_month_total %.${rounding_precision}f $number_locale]
+	set invoice_month_total_pretty [lc_numeric $invoice_month_total %.${rounding_precision}f $number_locale]
+	set quote_month_total_pretty [lc_numeric $quote_month_total %.${rounding_precision}f $number_locale]
+	set bill_month_total_pretty [lc_numeric $bill_month_total %.${rounding_precision}f $number_locale]
+	set po_month_total_pretty [lc_numeric $po_month_total %.${rounding_precision}f $number_locale]
+
 	set last_value_list [im_report_render_header \
 	    -output_format $output_format \
 	    -group_def $report_def \