r16795 - gnucash/branches/2.2/src/import-export/qif-import - [r16758] Charles Day's improvements to qif memo/notes handling. bug #495219.
Andreas Köhler
andi5 at cvs.gnucash.org
Fri Jan 4 19:52:35 EST 2008
Author: andi5
Date: 2008-01-04 19:52:35 -0500 (Fri, 04 Jan 2008)
New Revision: 16795
Trac: http://svn.gnucash.org/trac/changeset/16795
Modified:
gnucash/branches/2.2/src/import-export/qif-import/qif-to-gnc.scm
Log:
[r16758] Charles Day's improvements to qif memo/notes handling. bug #495219.
Committed by warlord.
Modified: gnucash/branches/2.2/src/import-export/qif-import/qif-to-gnc.scm
===================================================================
--- gnucash/branches/2.2/src/import-export/qif-import/qif-to-gnc.scm 2008-01-05 00:52:25 UTC (rev 16794)
+++ gnucash/branches/2.2/src/import-export/qif-import/qif-to-gnc.scm 2008-01-05 00:52:35 UTC (rev 16795)
@@ -377,7 +377,8 @@
(qif-number (qif-xtn:number qif-xtn))
(qif-action (qif-xtn:action qif-xtn))
(qif-security (qif-xtn:security-name qif-xtn))
- (qif-memo (qif-split:memo (car (qif-xtn:splits qif-xtn))))
+ (qif-default-split (qif-xtn:default-split qif-xtn))
+ (qif-memo #f)
(qif-from-acct (qif-xtn:from-acct qif-xtn))
(qif-cleared (qif-xtn:cleared qif-xtn))
(n- (lambda (n) (gnc-numeric-neg n)))
@@ -394,12 +395,20 @@
(xaccTransSetDescription gnc-xtn qif-payee))
(if qif-number
(xaccTransSetNum gnc-xtn qif-number))
+
+ ;; Look for the transaction memo (QIF "M" line). When a default split
+ ;; exists, the memo can be found there. Otherwise, it will be in the
+ ;; first member of the splits list.
+ (if qif-default-split
+ (set! qif-memo (qif-split:memo qif-default-split))
+ (set! qif-memo (qif-split:memo (car (qif-xtn:splits qif-xtn)))))
(if qif-memo
- (begin
- (xaccSplitSetMemo gnc-near-split qif-memo)
(if (or (not qif-payee)
- (equal? qif-payee ""))
- (xaccTransSetDescription gnc-xtn qif-memo))))
+ (equal? qif-payee ""))
+ (xaccTransSetDescription gnc-xtn qif-memo)
+ ;; Use the memo for the transaction notes. Previously this went to
+ ;; the debit/credit lines. See bug 495219 for more information.
+ (xaccTransSetNotes gnc-xtn qif-memo)))
(if (eq? qif-cleared 'cleared)
(xaccSplitSetReconcile gnc-near-split #\c))
@@ -428,7 +437,10 @@
(far-acct-type #f)
(far-acct #f)
(split-amt (qif-split:amount qif-split))
- (memo (qif-split:memo qif-split))
+ ;; For split transactions, get this split's memo.
+ (memo
+ (if qif-default-split
+ (qif-split:memo qif-split) #f))
(cat (qif-split:category qif-split)))
(if (not split-amt) (set! split-amt (gnc-numeric-zero)))
More information about the gnucash-changes
mailing list