From 8b3787a20e801946fddcf70d2b839afe6f656386 Mon Sep 17 00:00:00 2001 From: Dave Peticolas Date: Fri, 13 Jul 2001 06:13:29 +0000 Subject: [PATCH] 2001-07-12 Dave Peticolas * src/gnome/window-register.c: same as below * src/scm/report/taxtxf.scm: use split amount git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@4951 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 6 ++++++ src/gnome/window-register.c | 2 +- src/scm/report/taxtxf.scm | 8 ++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6170a546db..0d113305c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-07-12 Dave Peticolas + + * src/gnome/window-register.c: same as below + + * src/scm/report/taxtxf.scm: use split amount + 2001-07-13 Robert Graham Merkel * src/scm/report/payables.scm: New file - an diff --git a/src/gnome/window-register.c b/src/gnome/window-register.c index 20969215e5..570adca086 100644 --- a/src/gnome/window-register.c +++ b/src/gnome/window-register.c @@ -1180,7 +1180,7 @@ print_check_cb(GtkWidget * widget, gpointer data) gh_procedure_p(print_check)) { payee = xaccTransGetDescription(trans); - amount = xaccSplitGetValue(split); + amount = xaccSplitGetAmount(split); amount = gnc_numeric_abs (amount); date = xaccTransGetDate(trans); memo = xaccSplitGetMemo(split); diff --git a/src/scm/report/taxtxf.scm b/src/scm/report/taxtxf.scm index 95030f3779..2d1032d0f0 100644 --- a/src/scm/report/taxtxf.scm +++ b/src/scm/report/taxtxf.scm @@ -597,8 +597,8 @@ (map (lambda (spl) (let* ((date (gnc:transaction-get-date-posted (gnc:split-get-parent spl))) - (value (gnc:numeric-to-double - (gnc:split-get-value spl))) + (amount (gnc:numeric-to-double + (gnc:split-get-amount spl))) ;; TurboTax 1999 and 2000 ignore dates after Dec 31 (fudge-date (if (and full-year? (gnc:timepair-lt to-value date)) @@ -606,8 +606,8 @@ date))) (if tax-mode? (render-level-x-account table lev max-level account - value suppress-0 #f date) - (render-txf-account account value + amount suppress-0 #f date) + (render-txf-account account amount #t fudge-date #t date)))) split-list)))