diff --git a/AUTHORS b/AUTHORS index 7c9d280d39..7b2637bf12 100644 --- a/AUTHORS +++ b/AUTHORS @@ -110,6 +110,7 @@ Mike Simons misc configure.in patches Richard Skelton for Solaris cleanup Henning Spruth for German text & euro date rework Robby Stephenson register & file history patches +Christian Stimming report patch Herbert Thoma gnome register & euro support patches Diane Trout scheme qif import patch Richard Wackerbarth patch to gnc-prices, qif import fixes diff --git a/doc/sgml/C/xacc-about.sgml b/doc/sgml/C/xacc-about.sgml index d0b27ab120..c22df4a644 100644 --- a/doc/sgml/C/xacc-about.sgml +++ b/doc/sgml/C/xacc-about.sgml @@ -760,6 +760,7 @@ Motif as a school project, taking it to version 0.9 by October for German text and euro date rework + robby.stephenson@usa.net Robby Stephenson @@ -767,6 +768,15 @@ Motif as a school project, taking it to version 0.9 by October register & file history patches + + + stimming@uclink.berkeley.edu> Christian + Stimming + +report patch + + + tma@iis.fhg.de Herbert Thoma diff --git a/src/scm/report-utilities.scm b/src/scm/report-utilities.scm index 8d3837fccb..a252cab562 100644 --- a/src/scm/report-utilities.scm +++ b/src/scm/report-utilities.scm @@ -32,6 +32,12 @@ (define (gnc:amount->formatted-string amount shares_value?) (gnc:amount->string amount #t #t shares_value?)) +(define (gnc:amount->formatted-currency-string amount + this_currency shares_value?) + (gnc:amount->string-helper (exact->inexact amount) + #t #t shares_value? + this_currency)) + (define (gnc:account-has-shares? account) (let ((type (gnc:account-type->symbol (gnc:account-get-type account)))) (member type '(STOCK MUTUAL CURRENCY)))) diff --git a/src/scm/report/balance-and-pnl.scm b/src/scm/report/balance-and-pnl.scm index 75d1c80096..3c50a1d7f1 100644 --- a/src/scm/report/balance-and-pnl.scm +++ b/src/scm/report/balance-and-pnl.scm @@ -93,7 +93,9 @@ (gnc:account-get-type level-2-account)))) (html-table-row-align (list - account-name type-name (gnc:amount->formatted-string l2-value #f)) + account-name type-name + (gnc:amount->formatted-currency-string + l2-value (gnc:account-get-currency level-2-account) #f)) (list "left" "center" "right")))) (define (render-level-1-account account l1-value) @@ -101,7 +103,8 @@ (type (gnc:account-get-type-string (gnc:account-get-type account)))) (html-table-row-align (list name type NBSP - (gnc:amount->formatted-string l1-value #f) + (gnc:amount->formatted-currency-string + l1-value (gnc:account-get-currency account) #f) NBSP NBSP) (list "left" "center" "right" "right" "right" "right"))))