sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #242 from afh/pull/year

Browse source 
Fix apply_year_directive
This commit is contained in:
John Wiegley 2014-02-16 23:01:19 -06:00
commit fea32e94a6
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/textual.cc
View file

@ -416,7 +416,7 @@ void instance_t::read_next_directive(bool& error_flag)
price_xact_directive(line); price_xact_directive(line);
break; break;
case 'Y': // set the current year case 'Y': // set the current year
apply_year_directive(line); apply_year_directive(line + 1);
break; break;
} }
} }
@ -865,7 +865,7 @@ void instance_t::apply_year_directive(char * line)
// This must be set to the last day of the year, otherwise partial // This must be set to the last day of the year, otherwise partial
// dates like "11/01" will refer to last year's november, not the // dates like "11/01" will refer to last year's november, not the
// current year. // current year.
unsigned short year(lexical_cast<unsigned short>(skip_ws(line + 1))); unsigned short year(lexical_cast<unsigned short>(skip_ws(line)));
DEBUG("times.epoch", "Setting current year to " << year); DEBUG("times.epoch", "Setting current year to " << year);
epoch = datetime_t(date_t(year, 12, 31)); epoch = datetime_t(date_t(year, 12, 31));
} }

24
test/regress/6E7C2DF9.test Normal file
View file

@ -0,0 +1,24 @@
Y 2010
10/10 * TwentyTen
Account:Ten $ 10.10
Assets:Cash
apply year 2011
11/11 * TwentyEleven
Account:Eleven $ 11.11
Assets:Cash
2012/12/12 * TwentyTwelve
Account:Twelve $ 12.12
Assets:Cash
11/11 * TwentyEleven Again
Account:Eleven $ 11.11
Assets:Cash
test reg --sort date account
10-Oct-10 TwentyTen Account:Ten $ 10.10 $ 10.10
11-Nov-11 TwentyEleven Account:Eleven $ 11.11 $ 21.21
11-Nov-11 TwentyEleven Again Account:Eleven $ 11.11 $ 32.32
12-Dec-12 TwentyTwelve Account:Twelve $ 12.12 $ 44.44
end test