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

-- do not add voided transsactions to lots.

Browse Source 
-- improve dagnostic prints for certain errors


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@10146 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2004-07-03 18:54:48 +00:00
parent bf408cb3c3
commit 75fbd13b64
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/engine/Scrub2.c
View File

@ -77,6 +77,11 @@ restart_loop:
/* If already in lot, then no-op */
if (split->lot) continue;
/* Skip voided transactions */
if (gnc_numeric_zero_p (split->amount) &&
xaccTransGetVoidStatus(split->parent)) continue;
if (xaccSplitAssign (split)) goto restart_loop;
}
xaccAccountCommitEdit (acc);
@ -113,6 +118,10 @@ xaccLotFill (GNCLot *lot)
split = pcy->PolicyGetSplit (pcy, lot);
if (!split) return; /* Handle the common case */
/* Reject voided transactions */
if (gnc_numeric_zero_p(split->amount) &&
xaccTransGetVoidStatus(split->parent)) return;
xaccAccountBeginEdit (acc);
/* Loop until we've filled up the lot, (i.e. till the
@ -121,8 +130,6 @@ xaccLotFill (GNCLot *lot)
{
Split *subsplit;
PINFO ("duuuuude split=%s %s", gnc_numeric_to_string
(split->amount),gnc_numeric_to_string (split->value));
subsplit = xaccSplitAssignToLot (split, lot);
if (subsplit == split)
{
@ -179,7 +186,7 @@ xaccLotScrubDoubleBalance (GNCLot *lot)
/* This lot has mixed currencies. Can't double-balance.
* Silently punt */
PWARN ("Lot with multiple currencies:\n"
"\ttrans=%s curr=%s\n", xaccTransGetDescription(trans),
"\ttrans=%s curr=%s", xaccTransGetDescription(trans),
gnc_commodity_get_fullname(trans->common_currency));
break;
}
@ -198,10 +205,19 @@ xaccLotScrubDoubleBalance (GNCLot *lot)
/* Unhandled error condition. Not sure what to do here,
* Since the ComputeCapGains should have gotten it right.
* I suppose there might be small rounding errors, a penny or two,
* the ideal thing would to figure out why there's a roudning
* the ideal thing would to figure out why there's a rounding
* error, and fix that.
*/
PERR ("Closed lot fails to double-balance !!\n");
PERR ("Closed lot fails to double-balance !! lot value=%s",
gnc_numeric_to_string (value));
GList *node;
for (node=lot->splits; node; node=node->next)
{
Split *s = node->data;
PERR ("s=%p amt=%s val=%s", s,
gnc_numeric_to_string(s->amount),
gnc_numeric_to_string(s->value));
}
}
LEAVE ("lot=%s", kvp_frame_get_string (gnc_lot_get_slots (lot), "/title"));
@ -409,6 +425,10 @@ restart:
rc = TRUE;
goto restart;
}
if (gnc_numeric_zero_p (split->amount))
{
PWARN ("Result of merge has zero amt!");
}
LEAVE (" splits merged=%d", rc);
return rc;
}