mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
fix the currency thing correctly
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1683 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
74a8cffef0
commit
5f8da61fdd
@ -28,7 +28,6 @@
|
|||||||
\********************************************************************/
|
\********************************************************************/
|
||||||
|
|
||||||
/* hack alert -- stocks probably not handled correctly
|
/* hack alert -- stocks probably not handled correctly
|
||||||
* this stuff still needs work
|
|
||||||
* also, check out a stock split tooo
|
* also, check out a stock split tooo
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -52,6 +51,11 @@
|
|||||||
|
|
||||||
/** GLOBALS *********************************************************/
|
/** GLOBALS *********************************************************/
|
||||||
|
|
||||||
|
/* XXX hack alert -- this default currency should be made configurable
|
||||||
|
* somewhere, somehow, somewhen
|
||||||
|
*/
|
||||||
|
static char *gnc_qif_import_currency = "USD";
|
||||||
|
|
||||||
static int error_code=0; /* error code, if error occurred */
|
static int error_code=0; /* error code, if error occurred */
|
||||||
|
|
||||||
/* This static indicates the debugging module that this .o belongs to. */
|
/* This static indicates the debugging module that this .o belongs to. */
|
||||||
@ -330,7 +334,7 @@ char * xaccReadQIFAccList (int fd, AccountGroup *grp, int cat)
|
|||||||
if (!grp) return 0x0;
|
if (!grp) return 0x0;
|
||||||
do {
|
do {
|
||||||
acc = xaccMallocAccount();
|
acc = xaccMallocAccount();
|
||||||
xaccAccountSetCurrency (acc, "USD");
|
xaccAccountSetCurrency (acc, gnc_qif_import_currency);
|
||||||
if (cat) {
|
if (cat) {
|
||||||
qifline = xaccReadQIFCategory (fd, acc);
|
qifline = xaccReadQIFCategory (fd, acc);
|
||||||
} else {
|
} else {
|
||||||
@ -502,7 +506,7 @@ GetSubQIFAccount (AccountGroup *rootgrp, char *qifline, int acc_type)
|
|||||||
xaccAccountSetName (xfer_acc, qifline);
|
xaccAccountSetName (xfer_acc, qifline);
|
||||||
xaccAccountSetDescription (xfer_acc, "");
|
xaccAccountSetDescription (xfer_acc, "");
|
||||||
xaccAccountSetNotes (xfer_acc, "");
|
xaccAccountSetNotes (xfer_acc, "");
|
||||||
xaccAccountSetCurrency (xfer_acc, "USD");
|
xaccAccountSetCurrency (xfer_acc, gnc_qif_import_currency);
|
||||||
|
|
||||||
if (0 > acc_type) acc_type = GuessAccountType (qifline);
|
if (0 > acc_type) acc_type = GuessAccountType (qifline);
|
||||||
xaccAccountSetType (xfer_acc, acc_type);
|
xaccAccountSetType (xfer_acc, acc_type);
|
||||||
@ -588,7 +592,7 @@ xaccGetSecurityQIFAccount (Account *acc, char *qifline)
|
|||||||
xaccAccountSetName (xfer_acc, qifline);
|
xaccAccountSetName (xfer_acc, qifline);
|
||||||
xaccAccountSetDescription (xfer_acc, "");
|
xaccAccountSetDescription (xfer_acc, "");
|
||||||
xaccAccountSetNotes (xfer_acc, "");
|
xaccAccountSetNotes (xfer_acc, "");
|
||||||
xaccAccountSetCurrency (xfer_acc, "USD");
|
xaccAccountSetCurrency (xfer_acc, gnc_qif_import_currency);
|
||||||
|
|
||||||
xaccAccountSetType (xfer_acc, STOCK);
|
xaccAccountSetType (xfer_acc, STOCK);
|
||||||
xaccInsertSubAccount (acc, xfer_acc);
|
xaccInsertSubAccount (acc, xfer_acc);
|
||||||
@ -1019,7 +1023,7 @@ xaccReadQIFAccountGroup( char *datafile )
|
|||||||
Account * acc = xaccMallocAccount();
|
Account * acc = xaccMallocAccount();
|
||||||
xaccAccountSetType (acc, typo);
|
xaccAccountSetType (acc, typo);
|
||||||
xaccAccountSetName (acc, name);
|
xaccAccountSetName (acc, name);
|
||||||
xaccAccountSetCurrency (acc, "USD");
|
xaccAccountSetCurrency (acc, gnc_qif_import_currency);
|
||||||
|
|
||||||
xaccGroupInsertAccount( grp, acc );
|
xaccGroupInsertAccount( grp, acc );
|
||||||
qifline = xaccReadQIFTransList (fd, acc, &bogus_acc_name);
|
qifline = xaccReadQIFTransList (fd, acc, &bogus_acc_name);
|
||||||
@ -1076,7 +1080,7 @@ xaccReadQIFAccountGroup( char *datafile )
|
|||||||
int guess_acc_name = 0;
|
int guess_acc_name = 0;
|
||||||
|
|
||||||
DEBUG ("got account\n");
|
DEBUG ("got account\n");
|
||||||
xaccAccountSetCurrency (acc, "USD");
|
xaccAccountSetCurrency (acc, gnc_qif_import_currency);
|
||||||
qifline = xaccReadQIFAccount (fd, acc);
|
qifline = xaccReadQIFAccount (fd, acc);
|
||||||
if (!qifline) { /* free up malloced data if the read bombed. */
|
if (!qifline) { /* free up malloced data if the read bombed. */
|
||||||
xaccFreeAccount(acc);
|
xaccFreeAccount(acc);
|
||||||
|
Loading…
Reference in New Issue
Block a user