diff --git a/gnucash/report/business-reports/new-aging.scm b/gnucash/report/business-reports/new-aging.scm index a9bb0a0452..444fcde90f 100644 --- a/gnucash/report/business-reports/new-aging.scm +++ b/gnucash/report/business-reports/new-aging.scm @@ -161,6 +161,9 @@ exist but have no suitable transactions.")) (define (gnc-owner-equal? a b) (string=? (gncOwnerReturnGUID a) (gncOwnerReturnGUID b))) +(define (accountowner split)) (retval (gnc-owner-equal? split-owner owner))) @@ -237,7 +240,7 @@ exist but have no suitable transactions.")) (setup-query query accounts report-date) (let* ((splits (xaccQueryGetSplitsUniqueTrans query)) (accounts (sort-and-delete-duplicates (map xaccSplitGetAccount splits) - gnc:account-path-less-p equal?))) + accountstring instead.") (sort-and-delete-duplicates (map xaccAccountGetCommodity accounts) (lambda (a b) - (stringstring instead.") (define (gnc:accounts-and-all-descendants accountslist) (sort-and-delete-duplicates (apply append accountslist (map gnc-account-get-descendants accountslist)) - (lambda (a b) - (stringsxml balance-sheet-uuid balance-sheet-options "balsheet-recursive"))) (test-equal "recursive. root = $760+15000+104600" - (list "#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00") + '("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00") (sxml->table-row-col sxml 1 3 6)) (test-equal "recursive. assets = $760+15000+104600" - (list "#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00") + '("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00") (sxml->table-row-col sxml 1 4 5)) (test-equal "recursive. bank1 = $4,709.00" (list "$4,709.00") @@ -294,7 +294,7 @@ (list "$100.00") (sxml->table-row-col sxml 1 9 3)) (test-equal "recursive. broker = $15000+2000.00" - (list "30 FUNDS" "$15,000.00" "$2,000.00" "$2,000.00") + '("$2,000.00" "$2,000.00" "30 FUNDS" "$15,000.00") (sxml->table-row-col sxml 1 10 4)) (test-equal "recursive. funds = $15,000.00" (list "30 FUNDS" "$15,000.00" "$15,000.00") @@ -326,10 +326,10 @@ (set-option! balance-sheet-options "Commodities" "Show Exchange Rates" #t) (let ((sxml (options->sxml balance-sheet-uuid balance-sheet-options "balsheet-enable show-fcur show-rates"))) (test-equal "show-fcur enabled" - (list "#200.00" "$340.00" "30 FUNDS" "$15,000.00" "$106,709.00" "$106,709.00") + '("#200.00" "$340.00" "$106,709.00" "$106,709.00" "30 FUNDS" "$15,000.00") (sxml->table-row-col sxml 1 3 6)) (test-equal "show-rates enabled" - (list "1 FUNDS" "$500.00" "#1.00" "$1.70") + '("#1.00" "$1.70" "1 FUNDS" "$500.00") (sxml->table-row-col sxml 2 #f #f))) ;;make-multilevel @@ -516,25 +516,25 @@ (let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options "multicol-balsheet-halfyear"))) (test-equal "bal-1/1/70" - '("01/01/70" "$113,100.00" "$113,100.00" "$8,970.00" "$2,000.00" "$6,870.00" - "$0.00" "$100.00" "$4,000.00" "$2,000.00" "$2,000.00" "10 FUNDS " "$130.00" - "$130.00" "#100.00 " "$100,000.00" "$113,100.00" "$9,500.00" "$9,500.00" - "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" "$0.00" "$0.00" - "$103,600.00" "1 FUNDS $200.00" "#1.00 $1.30") + '("01/01/70" "$113,100.00" "$113,100.00" "$8,970.00" "$2,000.00" + "$6,870.00" "$0.00" "$100.00" "$4,000.00" "$2,000.00" "$2,000.00" + "10 FUNDS " "$130.00" "$130.00" "#100.00 " "$100,000.00" "$113,100.00" + "$9,500.00" "$9,500.00" "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" + "$0.00" "$0.00" "$103,600.00" "#1.00 $1.30" "1 FUNDS $200.00") (sxml->table-row-col sxml 1 #f 2)) (test-equal "bal-1/1/71" - '("01/01/71" "$116,009.00" "$116,009.00" "$4,709.00" "$2,000.00" "$2,609.00" - "$0.00" "$100.00" "$11,000.00" "$2,000.00" "$9,000.00" "30 FUNDS " "$300.00" - "$300.00" "#200.00 " "$100,000.00" "$116,009.00" "$9,500.00" "$9,500.00" - "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" "$2,909.00" "$0.00" - "$106,509.00" "1 FUNDS $300.00" "#1.00 $1.50") + '("01/01/71" "$116,009.00" "$116,009.00" "$4,709.00" "$2,000.00" + "$2,609.00" "$0.00" "$100.00" "$11,000.00" "$2,000.00" "$9,000.00" + "30 FUNDS " "$300.00" "$300.00" "#200.00 " "$100,000.00" "$116,009.00" + "$9,500.00" "$9,500.00" "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" + "$2,909.00" "$0.00" "$106,509.00" "#1.00 $1.50" "1 FUNDS $300.00") (sxml->table-row-col sxml 1 #f 3)) (test-equal "bal-1/1/72" - '("01/01/72" "$117,529.00" "$117,529.00" "$4,709.00" "$2,000.00" "$2,609.00" - "$0.00" "$100.00" "$12,500.00" "$2,000.00" "$10,500.00" "30 FUNDS " "$320.00" - "$320.00" "#200.00 " "$100,000.00" "$117,529.00" "$9,500.00" "$9,500.00" - "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" "$4,429.00" "$0.00" - "$108,029.00" "1 FUNDS $350.00" "#1.00 $1.60") + '("01/01/72" "$117,529.00" "$117,529.00" "$4,709.00" "$2,000.00" + "$2,609.00" "$0.00" "$100.00" "$12,500.00" "$2,000.00" "$10,500.00" + "30 FUNDS " "$320.00" "$320.00" "#200.00 " "$100,000.00" "$117,529.00" + "$9,500.00" "$9,500.00" "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" + "$4,429.00" "$0.00" "$108,029.00" "#1.00 $1.60" "1 FUNDS $350.00") (sxml->table-row-col sxml 1 #f 4))) ;; the following includes non-zero retained earnings of $1,270 @@ -544,12 +544,11 @@ (let ((sxml (options->sxml multicol-balsheet-uuid multi-bs-options "multicol-balsheet-retained"))) (test-equal "bal-1/3/80" - '("$123,319.00" "$123,319.00" "$5,129.00" "$2,000.00" "$3,029.00" - "$0.00" "$100.00" "$17,000.00" "$2,000.00" "$15,000.00" "30 FUNDS " - "$1,190.00" "$1,190.00" "#700.00 " "$100,000.00" "$123,319.00" - "$9,500.00" "$9,500.00" "$500.00" "$9,000.00" "$9,500.00" - "$103,600.00" "$8,949.00" "$1,270.00" "$113,819.00" "1 FUNDS $500.00" - "#1.00 $1.70") + '("$123,319.00" "$123,319.00" "$5,129.00" "$2,000.00" "$3,029.00" "$0.00" + "$100.00" "$17,000.00" "$2,000.00" "$15,000.00" "30 FUNDS " "$1,190.00" + "$1,190.00" "#700.00 " "$100,000.00" "$123,319.00" "$9,500.00" "$9,500.00" + "$500.00" "$9,000.00" "$9,500.00" "$103,600.00" "$8,949.00" "$1,270.00" + "$113,819.00" "#1.00 $1.70" "1 FUNDS $500.00") (sxml->table-row-col sxml 1 #f 2))))) (define (multicol-pnl-tests)