gnucash maint: Better period totals formatting

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/825b3d3c (commit)
	from  https://github.com/Gnucash/gnucash/commit/7f746724 (commit)



commit 825b3d3cafa0c836e2e5de3e95cf5e9d53902d55
Author: Amm <ammdispose-gnucash at yahoo.com>
Date:   Thu May 8 20:08:31 2014 +0200

    Better period totals formatting
    
    This fixes formatting of period totals and makes it more informative and clear.
    
    Also changes string "Payment, thank you" to just "Payment".

diff --git a/src/report/business-reports/owner-report.scm b/src/report/business-reports/owner-report.scm
index a044dc9..ec86c20 100644
--- a/src/report/business-reports/owner-report.scm
+++ b/src/report/business-reports/owner-report.scm
@@ -343,7 +343,7 @@
        ((equal? type TXN-TYPE-PAYMENT)
         (gnc:make-html-text
 	 (gnc:html-markup-anchor
-	  (gnc:split-anchor-text split) (_ "Payment, thank you"))))
+	  (gnc:split-anchor-text split) (_ "Payment"))))
        (else (_ "Unknown"))))
      )
 
@@ -435,22 +435,29 @@
             (_ "Period Totals"))
            '())
 
-    ; This is hard-coded to expect 'debits' to follow 'credits'
-    (let ((row-contents '())
-        (credit-span (credit-col used-columns))
-        (debit-span
-        (if (credit-col used-columns) 1 (debit-col used-columns))))
-
-    ; HTML gets generated in reverse order
-    (if (debit-col used-columns) (addto! row-contents
-        (gnc:make-html-table-cell/size/markup
-        1 debit-span "total-number-cell"
-        (gnc:make-gnc-monetary currency debit))))
-    (if (credit-col used-columns) (addto! row-contents
-        (gnc:make-html-table-cell/size/markup
-        1 credit-span "total-number-cell"
-        (gnc:make-gnc-monetary currency credit))))
-    row-contents))))
+     (let ((row-contents '())
+         (pre-span 0))
+
+      ; HTML gets generated in reverse order
+      (if (value-col used-columns) (addto! row-contents
+          (gnc:make-html-table-cell/size/markup
+          1 1 "total-number-cell"
+          (gnc:make-gnc-monetary currency (gnc-numeric-add-fixed credit debit)))))
+      (if (debit-col used-columns) (addto! row-contents
+          (gnc:make-html-table-cell/size/markup
+          1 1 "total-number-cell"
+          (gnc:make-gnc-monetary currency debit))))
+      (if (credit-col used-columns) (addto! row-contents
+          (gnc:make-html-table-cell/size/markup
+          1 1 "total-number-cell"
+          (gnc:make-gnc-monetary currency credit))))
+      (if (memo-col used-columns) (set! pre-span (+ pre-span 1)))
+      (if (type-col used-columns) (set! pre-span (+ pre-span 1)))
+      (if (num-col used-columns) (set! pre-span (+ pre-span 1)))
+      (if (date-due-col used-columns) (set! pre-span (+ pre-span 1)))
+      (if (date-col used-columns) (set! pre-span (+ pre-span 1)))
+      (if (>= pre-span 2) (addto! row-contents (gnc:make-html-table-cell/size 1 (- pre-span 1) "")))
+     row-contents))))
 
     (if (value-col used-columns)
     (gnc:html-table-append-row/markup! 



Summary of changes:
 src/report/business-reports/owner-report.scm | 41 ++++++++++++++++------------
 1 file changed, 24 insertions(+), 17 deletions(-)