From 15d086d1784277e8e16645b1e726b11a13b3efb3 Mon Sep 17 00:00:00 2001 From: Charles Day Date: Thu, 27 Mar 2008 23:39:57 +0000 Subject: [PATCH] Bug #522795: Add QIF importer support for short sales and covers. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17057 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/import-export/qif-import/qif-parse.scm | 8 ++++---- src/import-export/qif/qif-parse.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/import-export/qif-import/qif-parse.scm b/src/import-export/qif-import/qif-parse.scm index c3feeac4c8..4e9dddc7b1 100644 --- a/src/import-export/qif-import/qif-parse.scm +++ b/src/import-export/qif-import/qif-parse.scm @@ -190,9 +190,9 @@ (let ((action-symbol (string-to-canonical-symbol read-value))) (case action-symbol ;; buy - ((buy kauf) + ((buy cvrshrt kauf) 'buy) - ((buyx kaufx) + ((buyx cvrshrtx kaufx) 'buyx) ((cglong kapgew) ;; Kapitalgewinnsteuer 'cglong) @@ -252,9 +252,9 @@ 'rtrncap) ((rtrncapx) 'rtrncapx) - ((sell verkauf) ;; verkaufen + ((sell shtsell verkauf) ;; verkaufen 'sell) - ((sellx verkaufx) + ((sellx shtsellx verkaufx) 'sellx) ((shrsin aktzu) 'shrsin) diff --git a/src/import-export/qif/qif-parse.c b/src/import-export/qif/qif-parse.c index f9013e9602..5cd9b67f65 100644 --- a/src/import-export/qif/qif-parse.c +++ b/src/import-export/qif/qif-parse.c @@ -127,8 +127,10 @@ build_action_map() g_assert(qif_action_map); QIF_ADD_ACT("buy", QIF_A_BUY); + QIF_ADD_ACT("cvrshrt", QIF_A_BUY); QIF_ADD_ACT("kauf", QIF_A_BUY); QIF_ADD_ACT("buyx", QIF_A_BUYX); + QIF_ADD_ACT("cvrshrtx", QIF_A_BUYX); QIF_ADD_ACT("kaufx", QIF_A_BUYX); QIF_ADD_ACT("cglong", QIF_A_CGLONG); QIF_ADD_ACT("kapgew", QIF_A_CGLONG); /* Kapitalgewinnsteuer */ @@ -172,8 +174,10 @@ build_action_map() QIF_ADD_ACT("rtrncap", QIF_A_RTRNCAP); QIF_ADD_ACT("rtrncapx", QIF_A_RTRNCAPX); QIF_ADD_ACT("sell", QIF_A_SELL); + QIF_ADD_ACT("shtsell", QIF_A_SELL); QIF_ADD_ACT("verkauf", QIF_A_SELL); /* verkaufen */ QIF_ADD_ACT("sellx", QIF_A_SELLX); + QIF_ADD_ACT("shtsellx", QIF_A_SELLX); QIF_ADD_ACT("verkaufx", QIF_A_SELLX); /* verkaufen */ QIF_ADD_ACT("shrsin", QIF_A_SHRSIN); QIF_ADD_ACT("aktzu", QIF_A_SHRSIN);