diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-08 13:36:21 -0500 |
| commit | 55c7792c9329f97dd19fc5aeca466cb2de4fbf9c (patch) | |
| tree | b820b7c4b064e5d430439839768aa5b855ce3a4a /src/derive.cc | |
| parent | 3f00f8362c2fdfae1dbb6517bc29c75e308bc4f0 (diff) | |
| parent | 60059750061fe59c83adc869f36335a083955608 (diff) | |
| download | fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.gz fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.tar.bz2 fork-ledger-55c7792c9329f97dd19fc5aeca466cb2de4fbf9c.zip | |
Merge branch 'next'
Diffstat (limited to 'src/derive.cc')
| -rw-r--r-- | src/derive.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/derive.cc b/src/derive.cc index d3a7a37d..081b96b2 100644 --- a/src/derive.cc +++ b/src/derive.cc @@ -307,7 +307,7 @@ namespace { DEBUG("derive.xact", "Setting note from match: " << *added->note); #endif } else { - added->payee = tmpl.payee_mask.expr.str(); + added->payee = tmpl.payee_mask.str(); DEBUG("derive.xact", "Setting payee from template: " << added->payee); } @@ -403,14 +403,14 @@ namespace { account_t * acct = NULL; if (! acct) { - acct = journal.find_account_re(post.account_mask->expr.str()); + acct = journal.find_account_re(post.account_mask->str()); #if defined(DEBUG_ON) if (acct) DEBUG("derive.xact", "Found account as a regular expression"); #endif } if (! acct) { - acct = journal.find_account(post.account_mask->expr.str()); + acct = journal.find_account(post.account_mask->str()); #if defined(DEBUG_ON) if (acct) DEBUG("derive.xact", "Found (or created) account by name"); |