r22781 - gnucash/branches/2.4/src/report/locale-specific/us - Update taxtxf.scm to fix beginning balance sign and signs for Transfer From/To amounts for liability/equity accounts; bug 667093

[J. Alex Aycinena]

Author: alex.aycinena
Date: 2013-02-16 18:11:31 -0500 (Sat, 16 Feb 2013)
New Revision: 22781
Trac: http://svn.gnucash.org/trac/changeset/22781

Modified:
   gnucash/branches/2.4/src/report/locale-specific/us/taxtxf.scm
Log:
Update taxtxf.scm to fix beginning balance sign and signs for Transfer From/To amounts for liability/equity accounts; bug 667093

Modified: gnucash/branches/2.4/src/report/locale-specific/us/taxtxf.scm
===================================================================
--- gnucash/branches/2.4/src/report/locale-specific/us/taxtxf.scm	2013-02-16 22:50:01 UTC (rev 22780)
+++ gnucash/branches/2.4/src/report/locale-specific/us/taxtxf.scm	2013-02-16 23:11:31 UTC (rev 22781)
@@ -52,6 +52,11 @@
 ;;
 ;; Add support for code N673, Format 4
 ;;
+;; February, 2013 Update:
+;;
+;; Fix beginning balance sign and signs for Transfer From/To amounts for 
+;; liability/equity accounts
+;;
 ;; From prior version:
 ;; NOTE: setting of specific dates is squirly! and seems
 ;; to be current-date dependant!  Actually, time of day dependant!  Just
@@ -841,7 +846,11 @@
                         (split-acct-commodity
                                            (xaccAccountGetCommodity split-acct))
                         (splt-amnt (xaccSplitGetAmount tran-split))
-                        (splt-amnt (if (eq? acct-type ACCT-TYPE-INCOME)
+                        (splt-amnt (if (or (eq? acct-type ACCT-TYPE-INCOME)
+                                           (eq? acct-type ACCT-TYPE-CREDIT)
+                                           (eq? acct-type ACCT-TYPE-PAYABLE)
+                                           (eq? acct-type ACCT-TYPE-LIABILITY)
+                                           (eq? acct-type ACCT-TYPE-EQUITY))
                                             splt-amnt
                                             (gnc-numeric-neg splt-amnt)))
                         (print-info (gnc-account-print-info split-acct #f))
@@ -1164,7 +1173,7 @@
               );; B/S acct with either beg bal, splits or end bal
               ;; print beg bal line for B/S accts
               (let* ((curr-conv-note "")
-                     (curr-conv-data (list beg-bal-acct-curr
+                     (curr-conv-data (list beg-bal-rpt-amount
                                                           curr-conv-note #f ""))
                      (curr-conv-data (if (gnc-commodity-equiv
                                                  account-commodity USD-currency)