IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix to warn user of transfers from/to same account

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@315 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas
1997-12-09 22:24:13 +00:00
parent f9e37a17ab
commit 04ed603164
1 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/RegWindow.c
View File

@@ -1319,35 +1319,36 @@ regSaveTransaction( RegWindow *regData, int position )
/* if a transfer account exists, and we are not trying to transfer /* if a transfer account exists, and we are not trying to transfer
* from ourself to ourself, then proceed, otheriwse ignore. */ * from ourself to ourself, then proceed, otheriwse ignore. */
/* hack alert -- should put up a popup warning if user tries if (xfer_acct) {
* to transfer from & to the same account -- the two must differ! */ if (((1 < regData->numAcc) && (xfer_acct != (Account *) (trans->credit)))
if (xfer_acct && ( || ((1 >= regData->numAcc) && (xfer_acct != regData->blackacc[0])) ) {
((1 < regData->numAcc) && (xfer_acct != (Account *) (trans->credit)))
|| ((1 >= regData->numAcc) && (xfer_acct != regData->blackacc[0])) )) {
/* for a new transaction, the default will be that the /* for a new transaction, the default will be that the
* transfer occurs from the debited account */ * transfer occurs from the debited account */
if( regData->changed & MOD_NEW) { if( regData->changed & MOD_NEW) {
trans->debit = (struct _account *)xfer_acct; trans->debit = (struct _account *)xfer_acct;
} }
/* for a general ledger, the transfer *must* occur /* for a general ledger, the transfer *must* occur
* from the debited account. */ * from the debited account. */
if ( (GEN_LEDGER == regData->type) || if ( (GEN_LEDGER == regData->type) ||
(INC_LEDGER == regData->type) || (INC_LEDGER == regData->type) ||
(PORTFOLIO == regData->type) ) { (PORTFOLIO == regData->type) ) {
trans->debit = (struct _account *)xfer_acct; trans->debit = (struct _account *)xfer_acct;
} }
/* for non-new transactions, the transfer may be from the /* for non-new transactions, the transfer may be from the
* debited or the credited account. Which one it was depends * debited or the credited account. Which one it was depends
* entirely on which account pointer is null after the * entirely on which account pointer is null after the
* removal of the old entry. The insertTransaction() * removal of the old entry. The insertTransaction()
* subroutine will find the null slot, and will insert * subroutine will find the null slot, and will insert
* into it automatically. */ * into it automatically. */
/* insert the transaction into the transfer account */ /* insert the transaction into the transfer account */
insertTransaction (xfer_acct, trans); insertTransaction (xfer_acct, trans);
} else {
errorBox (toplevel, XFER_SAME_MSG);
}
} }
} }
@@ -1370,14 +1371,23 @@ regSaveTransaction( RegWindow *regData, int position )
xfer_acct = xaccGetAccountFromName (topgroup, name); xfer_acct = xaccGetAccountFromName (topgroup, name);
if (xfer_acct) { if (xfer_acct) {
/* for a ledger, the transfer-to account is always the credited if (xfer_acct != ((Account *) (trans->debit))) {
* account. */ /* for a ledger, the transfer-to account is always
trans->credit = (struct _account *)xfer_acct; * the credited account. */
if (NULL != trans->credit) {
/* insert the transaction into the transfer account */ printf ("Internal Error: regSaveTransaction(): ");
insertTransaction (xfer_acct, trans); printf ("the credited account is not null. \n");
printf (" was 0x%x will be 0x%x \n", trans->credit, xfer_acct);
}
trans->credit = (struct _account *)xfer_acct;
/* insert the transaction into the transfer account */
insertTransaction (xfer_acct, trans);
} else {
errorBox (toplevel, XFER_SAME_MSG);
} }
} }
}
if( regData->changed & MOD_NUM ) if( regData->changed & MOD_NUM )
{ {