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

more rigorous transaction commit code shows up buglets in the register;

Browse Source 
work around one of these.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@9386 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2003-09-21 04:01:31 +00:00
parent b7f1c25c2d
commit 2b6830e50d
1 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/engine/Scrub.c
View File

@ -221,6 +221,16 @@ xaccSplitScrub (Split *split)
account = xaccSplitGetAccount (split); account = xaccSplitGetAccount (split);
} }
/* Grrr... the register gnc_split_register_load() line 203 of
* src/register/ledger-core/split-register-load.c will create
* free-floating bogus transactions. Ignore these for now ...
*/
if (!account)
{
PINFO ("Free Floating Transaction!");
return;
}
currency = xaccTransGetCurrency (trans); currency = xaccTransGetCurrency (trans);
/* If the account doesn't have a commodity, /* If the account doesn't have a commodity,
@ -314,52 +324,60 @@ xaccTransScrubImbalance (Transaction *trans, AccountGroup *root,
{ {
Split *balance_split = NULL; Split *balance_split = NULL;
gnc_numeric imbalance; gnc_numeric imbalance;
Account *account;
SplitList *node, *slist;
if (!trans || !root) return; if (!trans) return;
xaccTransScrubSplits (trans); xaccTransScrubSplits (trans);
/* If the transaction is balanced, nothing more to do */
imbalance = xaccTransGetImbalance (trans);
if (gnc_numeric_zero_p (imbalance)) return;
slist = xaccTransGetSplitList (trans);
if (!slist) return;
if (!parent)
{ {
Account *account; if (!root)
GList *node; {
Split *s = slist->data;
root = xaccAccountGetRoot (s->acc);
}
account = xaccScrubUtilityGetOrMakeAccount (root,
trans->common_currency, _("Imbalance"));
}
else
{
account = parent;
}
imbalance = xaccTransGetImbalance (trans); if (!account)
if (gnc_numeric_zero_p (imbalance)) {
PERR ("Can't get balancing account");
return; return;
}
if (!parent) for (node = slist; node; node = node->next)
{
Split *split = node->data;
if (xaccSplitGetAccount (split) == account)
{ {
account = xaccScrubUtilityGetOrMakeAccount (root, balance_split = split;
trans->common_currency, _("Imbalance")); break;
}
else
{
account = parent;
} }
}
if (!account) /* Put split into account before setting split value */
return; if (!balance_split)
{
balance_split = xaccMallocSplit (trans->book);
for (node = xaccTransGetSplitList (trans); node; node = node->next) xaccAccountBeginEdit (account);
{ xaccAccountInsertSplit (account, balance_split);
Split *split = node->data; xaccAccountCommitEdit (account);
if (xaccSplitGetAccount (split) == account)
{
balance_split = split;
break;
}
}
/* put split into account before setting split value */
if (!balance_split)
{
balance_split = xaccMallocSplit (root->book);
xaccAccountBeginEdit (account);
xaccAccountInsertSplit (account, balance_split);
xaccAccountCommitEdit (account);
}
} }
PINFO ("unbalanced transaction"); PINFO ("unbalanced transaction");
@ -367,24 +385,17 @@ xaccTransScrubImbalance (Transaction *trans, AccountGroup *root,
{ {
const gnc_commodity *currency; const gnc_commodity *currency;
const gnc_commodity *commodity; const gnc_commodity *commodity;
gboolean trans_was_open; gnc_numeric old_value, new_value;
gnc_numeric new_value;
Account *account;
trans_was_open = xaccTransIsOpen (trans); xaccTransBeginEdit (trans);
if (!trans_was_open)
xaccTransBeginEdit (trans);
currency = xaccTransGetCurrency (trans); currency = xaccTransGetCurrency (trans);
account = xaccSplitGetAccount (balance_split); old_value = xaccSplitGetValue (balance_split);
new_value = xaccSplitGetValue (balance_split);
/* Note: We have to round for the commodity's fraction, NOT any /* Note: We have to round for the commodity's fraction, NOT any
* already existing denominator (bug #104343), because either one * already existing denominator (bug #104343), because either one
* of the denominators might already be reduced. */ * of the denominators might already be reduced. */
new_value = gnc_numeric_sub (new_value, imbalance, new_value = gnc_numeric_sub (old_value, imbalance,
gnc_commodity_get_fraction(currency), gnc_commodity_get_fraction(currency),
GNC_RND_ROUND); GNC_RND_ROUND);
@ -392,21 +403,13 @@ xaccTransScrubImbalance (Transaction *trans, AccountGroup *root,
commodity = xaccAccountGetCommodity (account); commodity = xaccAccountGetCommodity (account);
if (gnc_commodity_equiv (currency, commodity)) if (gnc_commodity_equiv (currency, commodity))
xaccSplitSetAmount (balance_split, new_value);
if (!parent && gnc_numeric_zero_p (new_value))
{ {
xaccSplitDestroy (balance_split); xaccSplitSetAmount (balance_split, new_value);
balance_split = NULL;
} }
if (balance_split) xaccTransAppendSplit (trans, balance_split);
xaccTransAppendSplit (trans, balance_split);
xaccSplitScrub (balance_split); xaccSplitScrub (balance_split);
xaccTransCommitEdit (trans);
if (!trans_was_open)
xaccTransCommitEdit (trans);
} }
} }