diff --git a/AUTHORS b/AUTHORS index d4b75fec1a..d660e22dc3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -116,6 +116,7 @@ Christian Stimming report patch Bartek Szady engine and build system patches Herbert Thoma gnome register & euro support patches Diane Trout scheme qif import patch +Richard -Gilligan- Uschold tax report Richard Wackerbarth patch to gnc-prices, qif import fixes Rob Walker guile and register patches David Woodhouse Great Britain translations diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 48831ba17a..73014e0f8a 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -17,6 +17,7 @@ doc_DATA = \ quicktest.qif \ splitdemo.xac \ swipe.qif \ + taxreport.xac \ test.xac \ test2.xac \ test3.xac \ diff --git a/doc/examples/README b/doc/examples/README index b8cb41e897..bef2e01493 100644 --- a/doc/examples/README +++ b/doc/examples/README @@ -19,6 +19,10 @@ trading2.xac income taxes. In particular, a paycheck is split up into several pieces. +taxreport.xac + A demo that can be used with the tax report to show income tax + related income and expenses. + Guide to QIF Files: ------------------- diff --git a/doc/examples/taxreport.xac b/doc/examples/taxreport.xac new file mode 100644 index 0000000000..945e73f0a7 Binary files /dev/null and b/doc/examples/taxreport.xac differ diff --git a/doc/sgml/C/Makefile.am b/doc/sgml/C/Makefile.am index e46214e837..8cedc18cc8 100644 --- a/doc/sgml/C/Makefile.am +++ b/doc/sgml/C/Makefile.am @@ -35,6 +35,7 @@ GNUCASH_SGML_FILES = \ xacc-regwin-kbd.sgml \ xacc-regwin.sgml \ xacc-reports.sgml \ + xacc-tax-report.sgml \ xacc-ticker.sgml \ xacc-trans-report.sgml \ xacc-userdocs.sgml \ diff --git a/doc/sgml/C/gnucash.sgml b/doc/sgml/C/gnucash.sgml index d2a018d3d4..b57c8f1b8d 100644 --- a/doc/sgml/C/gnucash.sgml +++ b/doc/sgml/C/gnucash.sgml @@ -29,6 +29,7 @@ + @@ -68,6 +69,7 @@ &xaccregwin; &xaccregwinkbd; &xaccreports; +&xacctaxreport; &xaccticker; &xacctransreport; &xaccdochack; diff --git a/doc/sgml/C/image/Makefile.am b/doc/sgml/C/image/Makefile.am index 3c1012fe8a..4da5c2f9c7 100644 --- a/doc/sgml/C/image/Makefile.am +++ b/doc/sgml/C/image/Makefile.am @@ -30,6 +30,8 @@ image_DATA = \ report-folio.png \ report-option.png \ report-pnl.png \ + report-tax.png \ + report-tax-options.png \ reportwin.png \ ticker-a.png \ ticker-b.png diff --git a/doc/sgml/C/image/report-tax-options.png b/doc/sgml/C/image/report-tax-options.png new file mode 100644 index 0000000000..92019fd3e9 Binary files /dev/null and b/doc/sgml/C/image/report-tax-options.png differ diff --git a/doc/sgml/C/image/report-tax.png b/doc/sgml/C/image/report-tax.png new file mode 100644 index 0000000000..769f7ef183 Binary files /dev/null and b/doc/sgml/C/image/report-tax.png differ diff --git a/doc/sgml/C/xacc-about.sgml b/doc/sgml/C/xacc-about.sgml index 33535980ad..2cfad42ef1 100644 --- a/doc/sgml/C/xacc-about.sgml +++ b/doc/sgml/C/xacc-about.sgml @@ -176,7 +176,7 @@ provide an accurate Profit & Loss statement. Lead Developers - rclark@hmc.edu Robin Clark +rclark@hmc.edu Robin Clark wrote the original X-Accountant in Motif as a school project, taking it to version 0.9 by October @@ -187,7 +187,7 @@ provide an accurate Profit & Loss statement. - linas@linas.org Linas Vepstas +linas@linas.org Linas Vepstas liked what he saw: the GUI was slick, the code was documented and well structured, and it was all GPL'ed. And so he @@ -208,7 +208,7 @@ provide an accurate Profit & Loss statement. - jcollins@gnucash.org Jeremy +jcollins@gnucash.org Jeremy Collins publicized the GnoMoney project widely @@ -225,7 +225,7 @@ provide an accurate Profit & Loss statement. - rlb@cs.utexas.edu Rob Browning +rlb@cs.utexas.edu Rob Browning abused everyone for not using Perl, and then after we added Perl support, dumped Perl in favor of Guile/Scheme @@ -238,7 +238,7 @@ provide an accurate Profit & Loss statement. - dave@krondo.com Dave Peticolas +dave@krondo.com Dave Peticolas hacks obsessively on GnuCash. But he can stop anytime he wants to. Really. @@ -248,7 +248,7 @@ provide an accurate Profit & Loss statement. - grib@billgribble.com Bill +grib@billgribble.com Bill Gribble @@ -270,27 +270,27 @@ provide an accurate Profit & Loss statement. - arensb@cfar.umd.edu Andrew +arensb@cfar.umd.edu Andrew Arensburger for FreeBSD and other patches - matt_armstrong@bigfoot.com Matt +matt_armstrong@bigfoot.com Matt Armstrong for misc fixes - fred@moremagic.com Fred Baube +fred@moremagic.com Fred Baube for attempted Java port/MoneyDance - dennisb@cs.chalmers.se Dennis +dennisb@cs.chalmers.se Dennis Björklund Swedish translation @@ -298,7 +298,7 @@ provide an accurate Profit & Loss statement. - bojsen@worldnet.att.net Per +bojsen@worldnet.att.net Per Bojsen several core dump fixes @@ -306,7 +306,7 @@ provide an accurate Profit & Loss statement. - tboldt@attglobal.net Terry Boldt +tboldt@attglobal.net Terry Boldt financial calculator and expression parser @@ -331,7 +331,7 @@ provide an accurate Profit & Loss statement. - wwc@wwcnet.nu Bill +wwc@wwcnet.nu Bill Carlson performance improvements @@ -339,14 +339,14 @@ provide an accurate Profit & Loss statement. - grahamc@zeta.org.au Graham +grahamc@zeta.org.au Graham Chapman for the xacc-rpts addon package - georgec@sco.com George Chen +georgec@sco.com George Chen for MS-Money QIF support @@ -359,14 +359,14 @@ provide an accurate Profit & Loss statement. - jcollins@gnucash.org Jeremey +jcollins@gnucash.org Jeremey Collins for GnoMoney and GTK port - mcondell@bbn.com Matthew +mcondell@bbn.com Matthew Condell FreeBSD patch @@ -374,7 +374,7 @@ provide an accurate Profit & Loss statement. - pcondon@rackspace.com Patrick +pcondon@rackspace.com Patrick Condron for webserver and T1 connection. @@ -382,7 +382,7 @@ provide an accurate Profit & Loss statement. - raphael.dechenaux@worldonline.fr Raphael +raphael.dechenaux@worldonline.fr Raphael Dechenaux register patch @@ -390,7 +390,7 @@ provide an accurate Profit & Loss statement. - Ciaran.Deignan@bull.net Ciaran +Ciaran.Deignan@bull.net Ciaran Deignan for AIX binary version @@ -398,7 +398,7 @@ provide an accurate Profit & Loss statement. - gjditchfield@acm.org Glen +gjditchfield@acm.org Glen Ditchfield updated documentation @@ -406,25 +406,25 @@ provide an accurate Profit & Loss statement. - tyson@tyse.net Tyson Dowd +tyson@tyse.net Tyson Dowd for config/make patches and debian maintenance - ripley@xs4all.nl Koen D'Hondt +ripley@xs4all.nl Koen D'Hondt for Solaris patches to XmHTML - bob@mostly.com Bob Drzyzgula +bob@mostly.com Bob Drzyzgula for budgeting design notes - pjf@schools.net.au Paul +pjf@schools.net.au Paul Fenwick ASX support, Finance::Quote @@ -432,7 +432,7 @@ provide an accurate Profit & Loss statement. - hfiguiere@teaser.fr Hubert +hfiguiere@teaser.fr Hubert Figuiere patch to gnc-prices @@ -440,7 +440,7 @@ provide an accurate Profit & Loss statement. - frob@df.ru Valek Filippov +frob@df.ru Valek Filippov Russian translation @@ -448,42 +448,42 @@ provide an accurate Profit & Loss statement. - ju_finck@mail.netwave.de Jan-Uwe +ju_finck@mail.netwave.de Jan-Uwe Finck for German message translation - kevinfinn@mediaone.net Kevin +kevinfinn@mediaone.net Kevin Finn auto-decimal point patch, options patch - rjf@aracnet.com Ron +rjf@aracnet.com Ron Forrester for gnome patches - DFreese@osc.uscg.mil Dave +DFreese@osc.uscg.mil Dave Freese for leap-year fix - jgoerzen@complete.org John +jgoerzen@complete.org John Goerzen file i/o fix for 64-bit architectures - grib@billgribble.com Bill +grib@billgribble.com Bill Gribble QIF import code, check printing, transaction find @@ -491,33 +491,33 @@ provide an accurate Profit & Loss statement. - otto@bug.redhat.com Otto +otto@bug.redhat.com Otto Hammersmith for RedHat RPM packaging - offby1@blarg.net Eric Hanchrow +offby1@blarg.net Eric Hanchrow updated currency documentation - haral@codec.ro Alexandru +haral@codec.ro Alexandru Harsanyi for fixing miscellaneous core dumps and lockups. - john@dhh.gt.org John Hasler +john@dhh.gt.org John Hasler engine patch - hellan@acm.org Jon Kåre +hellan@acm.org Jon Kåre Hellan for fixing miscellaneous core dumps and lockups. @@ -525,7 +525,7 @@ provide an accurate Profit & Loss statement. - PrakashK@bigfoot.com Prakash +PrakashK@bigfoot.com Prakash Kailasa for gnome build fixes @@ -533,7 +533,7 @@ provide an accurate Profit & Loss statement. - small@arcadia.spb.ru Alexey +small@arcadia.spb.ru Alexey Kakunin quickfill patch for cyrillic @@ -541,54 +541,54 @@ provide an accurate Profit & Loss statement. - tkludy@csd.sgi.com Tom Kludy +tkludy@csd.sgi.com Tom Kludy for SGI Irix port - sk@xgm.de Sven Kuenzler +sk@xgm.de Sven Kuenzler for SuSE README file - blarsen@ada-works.com Bryan +blarsen@ada-works.com Bryan Larsen guile budget report - mellon@andare.fugue.com Ted +mellon@andare.fugue.com Ted Lemon for NetBSD port - y-le-ny@ifrance.com Yannick Le +y-le-ny@ifrance.com Yannick Le Ny pour la traduction en Français - glikely@nortelnetworks.com Grant +glikely@nortelnetworks.com Grant Likely gnome and engine patches - martinh@pegasus.cc.ucf.edu Heath +martinh@pegasus.cc.ucf.edu Heath Martin major work on the gnome register - mgmartin@abacusnet.net Matt +mgmartin@abacusnet.net Matt Martin guile error handling code @@ -596,7 +596,7 @@ provide an accurate Profit & Loss statement. - rgmerk@mira.net Robert Graham +rgmerk@mira.net Robert Graham Merkel reporting, gnome, and configuration patches. @@ -604,7 +604,7 @@ provide an accurate Profit & Loss statement. - juanmagm@mail.com Juan Manuel +juanmagm@mail.com Juan Manuel García Molina spanish translation @@ -612,7 +612,7 @@ provide an accurate Profit & Loss statement. - molnarc@mandrakesoft.com Christopher +molnarc@mandrakesoft.com Christopher Molnar build system patch @@ -620,7 +620,7 @@ provide an accurate Profit & Loss statement. - mooney@dogbert.cc.ndsu.NoDak.edu Tim +mooney@dogbert.cc.ndsu.NoDak.edu Tim Mooney port to alpha-dec-osf4.0f @@ -628,7 +628,7 @@ provide an accurate Profit & Loss statement. - gam3@ann.softgams.com G. Allen Morris +gam3@ann.softgams.com G. Allen Morris III for QIF core dump fix @@ -636,7 +636,7 @@ provide an accurate Profit & Loss statement. - sjmurdoch@linuxfan.com Steven +sjmurdoch@linuxfan.com Steven Murdoch gnc-prices fix for London exchange @@ -644,14 +644,14 @@ provide an accurate Profit & Loss statement. - brent@baton.phys.lsu.edu Brent +brent@baton.phys.lsu.edu Brent Neal TIAA-CREF support - spacey@inch.com Peter +spacey@inch.com Peter Norton for a valiant attempt at a GTK port @@ -659,7 +659,7 @@ provide an accurate Profit & Loss statement. - webmaster@obsidian.uia.net OmNiBuS +webmaster@obsidian.uia.net OmNiBuS web site graphics and content @@ -667,7 +667,7 @@ provide an accurate Profit & Loss statement. - gordo@pincoya.com Gordon Oliver +gordo@pincoya.com Gordon Oliver multiple currency status line patch @@ -675,68 +675,68 @@ provide an accurate Profit & Loss statement. - mopyr@IPM.Lviv.UA Myroslav +mopyr@IPM.Lviv.UA Myroslav Opyr for misc patches - laurent.pelecq@wanadoo.fr Laurent +laurent.pelecq@wanadoo.fr Laurent Pélecq i18n patches with gettext - Alain.Peyrat@nmu.alcatel.fr Alain +Alain.Peyrat@nmu.alcatel.fr Alain Peyrat for configure.in patches - peter@wuzel.m.isar.de Peter +peter@wuzel.m.isar.de Peter Pointner motif and configuration patches - maufk@csv.warwick.ac.uk Gavin +maufk@csv.warwick.ac.uk Gavin Porter for euro style dates - tpo@spin.ch Tomas Pospisek +tpo@spin.ch Tomas Pospisek debian patches - rr@sco.com Ron Record +rr@sco.com Ron Record for SCO Unixware and OpenServer binaries - Keith.Refson@earth.ox.ac.uk Keith +Keith.Refson@earth.ox.ac.uk Keith Refson Solaris fixes - schoenberger@signsoft.com Dirk +schoenberger@signsoft.com Dirk Schoenberger began the Qt/KDE port - jan.schrage@urz.uni-heidelberg.de Jan +jan.schrage@urz.uni-heidelberg.de Jan Schrage documentation patches @@ -744,7 +744,7 @@ provide an accurate Profit & Loss statement. - cls@seawood.org Christopher +cls@seawood.org Christopher Seawood for XbaeMatrix core dump @@ -752,7 +752,7 @@ provide an accurate Profit & Loss statement. - aleseveso@tiscalinet.it Alessandro +aleseveso@tiscalinet.it Alessandro Seveso Italian translations @@ -760,21 +760,21 @@ provide an accurate Profit & Loss statement. - msimons@fsimons01.erols.com Mike +msimons@fsimons01.erols.com Mike Simons misc configure.in patches - rich@brake.demon.co.uk Richard +rich@brake.demon.co.uk Richard Skelton for Solaris cleanup - spruth@bigfoot.com Henning +spruth@bigfoot.com Henning Spruth for German text and euro date rework @@ -782,7 +782,7 @@ provide an accurate Profit & Loss statement. - robby.stephenson@usa.net Robby +robby.stephenson@usa.net Robby Stephenson register & file history patches @@ -790,7 +790,7 @@ provide an accurate Profit & Loss statement. - stimming@uclink.berkeley.edu Christian +stimming@uclink.berkeley.edu Christian Stimming report patch @@ -798,7 +798,7 @@ provide an accurate Profit & Loss statement. - bszx@bszxdomain.edu.eu.org Bartek +bszx@bszxdomain.edu.eu.org Bartek Szady engine and build system patches @@ -806,47 +806,57 @@ provide an accurate Profit & Loss statement. - tma@iis.fhg.de Herbert Thoma +tma@iis.fhg.de Herbert Thoma gnome register & euro support patches + - detrout@earthlink.net Diane +detrout@earthlink.net Diane Trout scheme qif import patch + - rkw@dataplex.net Richard +uschold@cs.ucf.edu Richard + -Gilligan- Uschold + +tax report + + + + +rkw@dataplex.net Richard Wackerbarth patch to gnc-prices, qif import fixes - rob@valinux.com Rob Walker +rob@valinux.com Rob Walker guile and register patches - dwmw2@infradead.org David +dwmw2@infradead.org David Woodhouse Great Britain translations - gooch@ic.EECS.Berkeley.EDU Ken +gooch@ic.EECS.Berkeley.EDU Ken Yamaguchi QIF import fixes; MYM import - shimpei@gol.com Shimpei +shimpei@gol.com Shimpei Yamashita Japanese translation diff --git a/doc/sgml/C/xacc-reports.sgml b/doc/sgml/C/xacc-reports.sgml index d3eb7017b1..cfcfb15b70 100644 --- a/doc/sgml/C/xacc-reports.sgml +++ b/doc/sgml/C/xacc-reports.sgml @@ -35,6 +35,12 @@ +Tax Report: + shows tax related Income and Expenses. + + + + Balance Tracker tracks the balance of one or more accounts over time, and supports graphical output (if you have gnuplot diff --git a/src/scm/report/Makefile.am b/src/scm/report/Makefile.am index 21e25d659e..a23a511194 100644 --- a/src/scm/report/Makefile.am +++ b/src/scm/report/Makefile.am @@ -9,7 +9,8 @@ gncscm_DATA = \ folio.scm \ hello-world.scm \ report-list.scm \ - transaction-report.scm + transaction-report.scm \ + tax.scm EXTRA_DIST = \ .cvsignore \ diff --git a/src/scm/report/report-list.scm b/src/scm/report/report-list.scm index 8b0134b7b2..35f7198334 100644 --- a/src/scm/report/report-list.scm +++ b/src/scm/report/report-list.scm @@ -8,3 +8,4 @@ (gnc:depend "report/transaction-report.scm") (gnc:depend "report/budget-report.scm") (gnc:depend "report/account-summary.scm") +(gnc:depend "report/tax.scm")