[PATCH] - bug #554394 - Income Tax Enhancements - missing German patches attached

[J. Alex Aycinena]

Hello,

I realised after sending this in last night that the changes included
in the patchfile would break the functioning of the existing,
otherwise unmodified, German version of the tax report. So I send in
three additional patches to correct this:

- patchtxf-de_DE: make functions called from outside (e.g., from
dialog-tax-info.c) have a consistent signature with those same
functions in txf.scm (define tax-entity-type , define getters/setters,
add tax-entity-type as an argument to existing functions)

- patchde_DE: export new functions added to txf-de_DE.scm

- patchtaxtxf-de_DE: add "" as  tax-entity-type argument to functions
called on txf-de_DE.scm (which defaults to existing codes)

These need to be applied with the earlier patchfile.

Christian,

Since I believe you are the author of the German version of the tax
report, I would appreciate it if you especially would look over these
changes. I have to set up a German locale to test them, which I have
not yet done but will do next. If you could test them too, that would
be great. Finally, in 'txf-de_DE.scm', there is a define which should
be in German rather than English, since its text is displayed in the
revised Income Tax Options dialog, based on locale:

(define txf-tax-entity-types
  (list
   (cons '01 #("Individual, Joint, etc." "Files Individual German Tax Return"))
   (cons '99 #("None" "No Income Tax Options Provided"))))

I would be grateful if you could change the quoted text to German for
me. (I assumed the existing codes are for an individual rather than a
corporation or other type of entity). For reference, the US version
looks like this:

(define txf-tax-entity-types
  (list
   (cons 'F1040 #("Individual, Joint, etc." "Files US Form 1040 Tax Return"))
   (cons 'F1065 #("Partnership" "Files US Form 1065 Tax Return"))
   (cons 'F1120 #("Corporation" "Files US Form 1120 Tax Return"))
   (cons 'F1120S #("S Corporation" "Files US Form 1120S Tax Return"))
   (cons 'Other #("None" "No Income Tax Options Provided"))))

Sorry for having overlooked that. I look forward to your feedback.

Regards and thanks,

Alex

On Sun, Nov 1, 2009 at 7:37 PM, J. Alex Aycinena
<alex.aycinena at gmail.com> wrote:
> Hello,
>
> I am submitting patches that implement the following enhancements
> related to Income Taxes in Gnucash:
>
> - update the tax information in 'txf.scm', which is based on V037 of
> the TXF Spec,  to V041, the last version issued (bug #554394)
> - provide support for multiple copies of certain tax Forms/Schedules
> (e.g., Schedule C(1), Schedule C(2), etc.)
> - support multiple types of tax entities: partnerships, corporations
> and S corporations, in addition to individual tax payers
> - support balance sheet accounts, required for these new tax entity types
> - add the term 'Income' in several places to avoid confusion with
> sales or VAT style taxes in the business features (e.g., change the
> menu from 'Tax Options' to 'Income Tax Options')
>
> The following files were changed, as follows, to implement these changes:
>
> 1. src/engine/Account.c and
> 2. src/engine/Account.h: add copy number capability (define
> 'xaccAccountGetTaxUSCopyNumber' and 'xaccAccountSetTaxUSCopyNumber');
> modify 'xaccAccountSetTaxUSCode' to remove KVP when no tax-code
> assigned, clean up tax-source descriptions
>
> 3. src/gnome/gnc-plugin-basic-commands.c: change 'Tax Options' to
> 'Income Tax Options'
>
> 4. src/app-utils/gnc-ui-util.c and
> 5. src/app-utils/gnc-ui-util.h: add setter and getter functions for
> book tax name and book tax type which are stored in a book KVP, show
> copy information in accounts page, tax column, show error messages for
> various conditions
>
> 6. src/app-utils/app-utils.i: add 'gnc_get_current_book_tax_name' and
> 'gnc_get_current_book_tax_type' functions
>
> 7. src/gnome/dialog-tax-info.c: add copy number and tax entity name
> and type, and balance sheet account handling capability
>
> 8. src/gnome/glade/tax.glade: add tax entity name, tax entity type,
> asset, liability/equity and copy number widgets
>
> 9. src/tax/us/txf.scm: update to V041 for individuals, add V041
> support for multiple additional tax entity types and balance sheet
> accounts and related tax codes, add tax form line data
>
> 10. src/tax/us/us.scm: export new functions defined in txf.scm
>
> 11. src/report/locale-specific/us/taxtxf.scm: add support for multiple
> copies of Forms/Schedules, add support for Format 6, use Form/Schedule
> line #'s to sort report, update from "V037" to "V041", add support for
> taxpayer types other than F1040, add warning messages if there are
> some inconsistent codes assigned and list
>
> These changes are in the attached patchfile which was generated
> against svn r18406.
>
> I would appreciate it if someone could approve and commit these
> changes. I've tested them quite extensively and it would be good if
> they could be included in the development test releases before the
> next stable release.
>
> Regards and thanks,
>
> Alex
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patchde_DE
Type: application/octet-stream
Size: 820 bytes
Desc: not available
URL: <http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20091102/d8081b66/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patchtaxtxf-de_DE
Type: application/octet-stream
Size: 1280 bytes
Desc: not available
URL: <http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20091102/d8081b66/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patchtxf-de_DE
Type: application/octet-stream
Size: 6229 bytes
Desc: not available
URL: <http://lists.gnucash.org/pipermail/gnucash-devel/attachments/20091102/d8081b66/attachment-0002.obj>