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 account transfers about for ledger windows

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@264 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 1997-12-04 04:59:59 +00:00
parent f362f43413
commit 69b1881a43
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/RegWindow.c
View File

@ -1104,6 +1104,8 @@ regSaveTransaction( RegWindow *regData, int position )
int row = position * NUM_ROWS_PER_TRANS + NUM_HEADER_ROWS;
Transaction *trans;
Boolean dateOutOfOrder = False;
Account *old_xfrm_acct = NULL;
Account *old_xto_acct = NULL;
/* If nothing has changed, we have nothing to do */
if (MOD_NONE == regData->changed) return;
@ -1135,6 +1137,37 @@ regSaveTransaction( RegWindow *regData, int position )
if (acc) acc->parent->saved = False;
}
/* if not a ledger, then we shouldn't get here ... */
if( (regData->changed & MOD_XTO ) &&
((GEN_LEDGER == regData->type) ||
(INC_LEDGER == regData->type) ||
(PORTFOLIO == regData->type)) )
{
Account *xfer_acct;
/* we do the "to" transfers in three steps: first, we
* remove the transaction from the "to" account, then
* we handle the "from" transfer, and finally, we add
* the transaction to the "to" account. It is split
* up this way to avoid conflicts if the user is attempting
* to reverse "from" and "to" in a general ledger window.
* If we didn't split it up this way, there would be a moment
* when "from" and "to" were identical, which is an error
* condition that is trapped. We avoid this by making "to"
* be null for a while, until the "from" work is completed.
*/
DEBUG("MOD_XTO_PHASE_ONE\n");
/* for a general ledger, from and to are easy to determine */
xfer_acct = (Account *) trans->credit;
if (xfer_acct) {
/* remove the transaction from wherever it used to be */
REMOVE_TRANS (xfer_acct, trans);
old_xto_acct = xfer_acct;
}
}
if( regData->changed & MOD_XFRM )
{
/* ... the transfer ... */
@ -1166,10 +1199,7 @@ regSaveTransaction( RegWindow *regData, int position )
if (xfer_acct) {
/* remove the transaction from wherever it used to be */
REMOVE_TRANS (xfer_acct, trans);
/* recalculate the balance and redisplay the window for the old acct */
RECALC_BALANCE (xfer_acct);
REFRESH_REGISTER (xfer_acct);
old_xfrm_acct = xfer_acct;
}
/* get the new account name */
@ -1218,24 +1248,12 @@ regSaveTransaction( RegWindow *regData, int position )
(INC_LEDGER == regData->type) ||
(PORTFOLIO == regData->type)) )
{
/* ... the transfer ... */
/* ... complete doing the XTO transfer ... */
/* see notes above for details */
char * name;
Account *xfer_acct;
DEBUG("MOD_XTO\n");
/* for a general ledger, from and to are easy to determine */
xfer_acct = (Account *) trans->credit;
if (xfer_acct) {
/* remove the transaction from wherever it used to be */
REMOVE_TRANS (xfer_acct, trans);
/* recalculate the balance and redisplay the window for the old acct */
RECALC_BALANCE (xfer_acct);
REFRESH_REGISTER (xfer_acct);
}
DEBUG("MOD_XTO_PHASE_TWO\n");
/* get the new account name */
name = XbaeMatrixGetCell(regData->reg,row+XTO_CELL_R, XTO_CELL_C);
@ -1549,6 +1567,18 @@ regSaveTransaction( RegWindow *regData, int position )
}
}
if (old_xfrm_acct) {
/* recalculate the balance and redisplay the window for the old acct */
RECALC_BALANCE (old_xfrm_acct);
REFRESH_REGISTER (old_xfrm_acct);
}
if (old_xto_acct) {
/* recalculate the balance and redisplay the window for the old acct */
RECALC_BALANCE (old_xto_acct);
REFRESH_REGISTER (old_xto_acct);
}
REFRESH_REGISTER ((trans->credit));
REFRESH_REGISTER ((trans->debit));
/* if this is a ledger window, then we have to update