r14581 - gnucash/branches/deprecated-cleanup - Pull trunk changes 14487:14580 into deprecated-cleanup branch.
David Hampton
hampton at cvs.gnucash.org
Sun Jul 30 00:57:43 EDT 2006
Author: hampton
Date: 2006-07-30 00:57:40 -0400 (Sun, 30 Jul 2006)
New Revision: 14581
Trac: http://svn.gnucash.org/trac/changeset/14581
Modified:
gnucash/branches/deprecated-cleanup/
gnucash/branches/deprecated-cleanup/ChangeLog
gnucash/branches/deprecated-cleanup/accounts/de_DE/acctchrt_skr03.gnucash-xea
gnucash/branches/deprecated-cleanup/autogen.sh
gnucash/branches/deprecated-cleanup/configure.in
gnucash/branches/deprecated-cleanup/doc/tip_of_the_day.list.in
gnucash/branches/deprecated-cleanup/lib/goffice-0.0.4/goffice/Makefile.am
gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/Makefile.am
gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/qsf-backend.c
gnucash/branches/deprecated-cleanup/lib/libqof/qof/Makefile.am
gnucash/branches/deprecated-cleanup/lib/libqof/qof/gnc-numeric.c
gnucash/branches/deprecated-cleanup/po/POTFILES.skip
gnucash/branches/deprecated-cleanup/src/app-utils/Makefile.am
gnucash/branches/deprecated-cleanup/src/bin/Makefile.am
gnucash/branches/deprecated-cleanup/src/business/business-core/Makefile.am
gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.c
gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.h
gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.c
gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.h
gnucash/branches/deprecated-cleanup/src/business/business-gnome/Makefile.am
gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-invoice.c
gnucash/branches/deprecated-cleanup/src/business/business-ledger/gncEntryLedger.c
gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/Makefile.am
gnucash/branches/deprecated-cleanup/src/core-utils/Makefile.am
gnucash/branches/deprecated-cleanup/src/core-utils/gnc-glib-utils.c
gnucash/branches/deprecated-cleanup/src/engine/Group.c
gnucash/branches/deprecated-cleanup/src/engine/Makefile.am
gnucash/branches/deprecated-cleanup/src/engine/gnc-engine.c
gnucash/branches/deprecated-cleanup/src/engine/gnc-filepath-utils.c
gnucash/branches/deprecated-cleanup/src/engine/test-core/test-engine-stuff.c
gnucash/branches/deprecated-cleanup/src/engine/test/test-resolve-file-path.c
gnucash/branches/deprecated-cleanup/src/gnc-module/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnc-module/gnc-module.c
gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-bar/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-baz/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-foo/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnome-search/search.glade
gnucash/branches/deprecated-cleanup/src/gnome-utils/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnome-utils/druid-gnc-xml-import.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/glade/preferences.glade
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-file.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-gnome-utils.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-main-window.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-tree-view.c
gnucash/branches/deprecated-cleanup/src/gnome/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnome/glade/account.glade
gnucash/branches/deprecated-cleanup/src/gnome/glade/budget.glade
gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-basic-commands.c
gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-account-tree.c
gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-register.c
gnucash/branches/deprecated-cleanup/src/gnome/schemas/Makefile.am
gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_general.schemas.in
gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_warnings.schemas.in
gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c
gnucash/branches/deprecated-cleanup/src/import-export/hbci/glade/hbci.glade
gnucash/branches/deprecated-cleanup/src/import-export/import-provider-format.glade
gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-file.scm
gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-parse.scm
gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-control.c
gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-model.c
gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.c
gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.h
gnucash/branches/deprecated-cleanup/src/register/register-core/Makefile.am
gnucash/branches/deprecated-cleanup/src/report/report-gnome/Makefile.am
gnucash/branches/deprecated-cleanup/src/report/report-system/Makefile.am
gnucash/branches/deprecated-cleanup/src/report/report-system/html-text.scm
gnucash/branches/deprecated-cleanup/src/report/report-system/report.scm
gnucash/branches/deprecated-cleanup/util/gnc-svnversion
Log:
Pull trunk changes 14487:14580 into deprecated-cleanup branch.
Property changes on: gnucash/branches/deprecated-cleanup
___________________________________________________________________
Name: svk:merge
- d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12822
+ d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:12923
Modified: gnucash/branches/deprecated-cleanup/ChangeLog
===================================================================
--- gnucash/branches/deprecated-cleanup/ChangeLog 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/ChangeLog 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1,3 +1,8 @@
+2006-07-30 David Hampton <hampton at employees.org>
+
+ * various: Pull trunk changes 14487:14580 into deprecated-cleanup
+ branch.
+
2006-07-27 David Hampton <hampton at employees.org>
* src/business/business-gnome/glade/billterms.glade: Fix a
@@ -155,6 +160,163 @@
* Below this line is the Trunk ChangeLog
********************
+2006-07-30 Andreas Köhler <andi5.py at gmx.net>
+
+ * src/gnome/schemas/apps_gnucash_warnings.schemas.in:
+ * src/gnome-utils/gnc-main-window.c: Add warning close_last_window
+ and show it when user tries to close the last GnuCash window.
+ Fixes #338865.
+
+ * src/gnome-utils/gnc-gnome-utils.c:
+ * src/gnome-utils/glade/preferences.glade:
+ * src/gnome/schemas/apps_gnucash_general.schemas.in: Add new
+ setting general/show_splash_screen to
+ preferences_dialog->General and only show the splash screen if
+ it is TRUE. Fixes 339876.
+
+ * src/gnome/gnc-plugin-page-account-tree.c:
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/gnome/gnc-plugin-basic-commands.c:
+ * src/gnome-utils/glade/preferences.glade: Fixed some duplicate
+ accelerators.
+
+ * src/gnome-utils/gnc-main-window.c:
+ * src/gnome/schemas/apps_gnucash_general.schemas.in:
+ * src/gnome-utils/glade/preferences.glade: Add preference
+ general/tab_position to choose the edge of the notebook the tabs
+ will be showed (top, bottom, left or right). Add it to
+ preferences_dialog->Windows. Move "Show close button on notebook
+ tabs" from General to Windows. Fixes #340299.
+
+2006-07-24 Derek Atkins <derek at ihtfp.com>
+
+ * [lots of Makefile.am files]:
+ Allow proper compile/install from tarball using separate builddir.
+ - Don't distribute (most) generated files.
+ - Be (more) consistent about when generated files are cleaned.
+
+ * po/POTFILES.skip:
+ - Now that we distribute the SX schema properly, don't skip it
+ in the POTFILES.skip file.
+
+2006-07-23 Andreas Köhler <andi5.py at gmx.net>
+
+ * src/gnome-utils/gnc-tree-view.c: Correctly set column sort
+ orders from gconf. Fixes #348248.
+
+2006-07-22 Derek Atkins <derek at ihtfp.com>
+
+ * configure.in: check for SLIB. (#347922)
+
+2006-07-21 Andreas Köhler <andi5.py at gmx.net>
+
+ * configure.in:
+ * src/gnome-utils/gnc-main-window.c: Make tabs within one notebook
+ reorderable by dnd for gtk>=2.10. Fixes #343454.
+
+2006-07-18 Christian Stimming <stimming at tuhh.de>
+
+ * src/gnc-module/gnc-module.c: On windows, deactivate gnucash's
+ extra de-quoting of path names that is done on the GNC_MODULE_PATH
+ env variable.
+
+2006-07-16 Derek Atkins <derek at ihtfp.com>
+
+ * configure.in:
+ check for (g-wrap) module (#347680)
+ Apparently some distributions ship g-wrap-config separately
+ from the g-wrap.scm guile module.
+
+ * src/import-export/qif-import/qif-file.scm:
+ Ignore any unknown !Option specification. Fixes #160735.
+
+ * src/import-export/qif-import/qif-parse.scm:
+ Allow comma-radix numbers without a radix. Fixes #142424.
+ I.e., allow "17.500" to be parsed either as "seventeen and a half"
+ or as "seventeen thousand five hundred". Note that numbers STILL
+ default to decimal-radix instead of asking the user to choose.
+
+ * src/business/business-core/gncEntry.[ch]:
+ * src/business/business-ledger/gncEntryLedger.c:
+ Properly round invoice entries and totals. Fixes #300042.
+ Perform internal computations to LCD, but then export rounded values.
+ Now, using the test case in Bug #300042 I get the same values
+ in the invoice window, in the printable invoice report, and
+ in the CoA Registers.
+
+2006-07-16 Andreas Köhler <andi5.py at gmx.net>
+
+ * src/gnome-utils/gnc-main-window.c: Do not move windows on
+ restoration that would be offscreen.
+
+2006-07-15 Derek Atkins <derek at ihtfp.com>
+
+ * src/business/business-core/gncAddress.[ch]:
+ Make GncAddress more QOF compliant. (#343726)
+ Adds BeginEdit/CommitEdit calls.
+
+ * src/business/business-gnome/dialog-invoice.c:
+ Set the summary bar values when the window is first opened (#345978).
+
+2006-07-15 Andreas Köhler <andi5.py at gmx.net>
+
+ * src/report/report-system/html-text.scm: Remove a duplicate of
+ gnc:html-text?.
+
+2006-07-15 Christian Stimming <stimming at tuhh.de>
+
+ * src/import-export/hbci/druid-hbci-initial.c: Remove obsolete
+ buttons for aqbanking/hbci setup that are unneeded. Fix crash due
+ to dangling points by deleting all pointers after calling
+ AB_Banking_Fini.
+
+2006-07-14 Derek Atkins <derek at ihtfp.com>
+
+ * configure.in:
+ * autogen.sh:
+ make sure that po/POTFILES.in exists so configure doens't complain.
+
+ * configure.in:
+ check for (g-wrap gw-glib-spec) instead of (g-wrap) #347404.
+
+2006-07-14 Andreas Köhler <andi5.py at gmx.net>
+
+ * src/gnome/schemas/Makefile.am: Add
+ apps_gnucash_scheduled_transctions.schemas.in. Fixes #340641.
+
+ * src/register/ledger-core/split-register-control.c:
+ * src/register/ledger-core/split-register-model.c: Let
+ GtkMessageDialog render the headers of two warnings in bold
+ font.
+
+2006-07-13 Andreas Köhler <andi5.py at gmx.net>
+
+ * doc/tip_of_the_day.list.in:
+ * lib/libqof/backend/file/qsf-backend.c:
+ * src/gnome-search/search.glade:
+ * src/gnome-utils/druid-gnc-xml-import.c:
+ * src/gnome-utils/glade/preferences.glade:
+ * src/gnome-utils/gnc-file.c:
+ * src/gnome/schemas/apps_gnucash_general.schemas.in:
+ * src/gnome/gnc-plugin-page-account-tree.c:
+ * src/gnome/gnc-plugin-page-register.c:
+ * src/import-export/import-provider-format.glade:
+ * src/report/report-system/report.scm: String fixes that have
+ been delayed due to the string freeze.
+
+ * src/gnome/glade/account.glade: In the account dialog, do not
+ expand the upper left entries when the window is resized.
+ Automatic scrollbars for the notes field.
+
+2006-07-12 Derek Atkins <derek at ihtfp.com>
+
+ * src/engine/Group.c:
+ Allow account-separator character in account names (#347321).
+ Revert to previous behavior of xaccGetAccountFromFullName()
+ which was changed in r13467 when the function was restructured.
+ This patch returns to the old behavior (but uses the new
+ function structure).
+
2006-07-09 Chris Lyttle <chris at wilddev.net>
* NEWS: Added some text about the release.
Modified: gnucash/branches/deprecated-cleanup/accounts/de_DE/acctchrt_skr03.gnucash-xea
===================================================================
--- gnucash/branches/deprecated-cleanup/accounts/de_DE/acctchrt_skr03.gnucash-xea 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/accounts/de_DE/acctchrt_skr03.gnucash-xea 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="ISO-8859-15"?>
<gnc-account-example>
<gnc-act:title>
Kontenrahmen SKR03
</gnc-act:title>
<gnc-act:short-description>
- Standardkontenrahmen SKR03 alpha allg.
+ Standardkontenrahmen SKR03
</gnc-act:short-description>
<gnc-act:long-description>
- Alpha-Version eines nicht vollständigen SKR03 mit relativ vielen Konten
+ Beta Version des Kontenrahmes SKR03 zum Erweitern und Umstrukturieren. Der Kontenrahmen sollte den eigenen Bedürfnissen angepasst werden was Struktur und Kontenbezeichnungen angeht. WICHTIG!: Die Privatkonten fließen nicht in die Berechnung des Berichtes Bilanz, sind jedoch im Bericht Bilanz aufgeführt. Die im Bericht Bilanz aufgeführte Passiva "Gewinnrücklagen" gibt den Saldo der GuV aus. Die Anlage dieses Kontenrahmens wurde von der Firma LiHAS - Linuxhaus Stuttgart - unterstützt.
</gnc-act:long-description>
<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
<gnc:account version="2.0.0">
<act:name>Aktiva</act:name>
- <act:id type="guid">c3e9d2cb51af856b5cd8fcde6d05b704</act:id>
+ <act:id type="guid">fc3b1f110a6686f3d40bb0c41c0f8de0</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -22,8 +22,8 @@
<act:description>Aktiva</act:description>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Anlage u. Kapitalkonten 0</act:name>
- <act:id type="guid">e2e9b85bb92351303776f0693fddc205</act:id>
+ <act:name>Anlage- u. Kapitalkonten 0</act:name>
+ <act:id type="guid">27356188a1963c1dbf943022441d095f</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -40,11 +40,11 @@
<slot:value type="integer">1</slot:value>
</slot>
</act:slots>
- <act:parent type="guid">c3e9d2cb51af856b5cd8fcde6d05b704</act:parent>
+ <act:parent type="guid">fc3b1f110a6686f3d40bb0c41c0f8de0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>0027 EDV-Software</act:name>
- <act:id type="guid">0d8d6d3f7328afa35b70a35afeb23cd8</act:id>
+ <act:id type="guid">8275e7a0b489940a2ba993f9019a898f</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -58,99 +58,71 @@
<slot:value type="integer">1</slot:value>
</slot>
</act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0090 Geschäftsbauten</act:name>
- <act:id type="guid">03a2a2f5e2f9ce02b3370ce5b1da6777</act:id>
+ <act:name>0410 Geschäftsausstattung</act:name>
+ <act:id type="guid">a588283077bd935dede66d13b2ee478f</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0090</act:code>
+ <act:code>0410</act:code>
<act:slots>
<slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:key>tax-related</slot:key>
+ <slot:value type="integer">1</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0200 Tech. Anlagen und Maschinen</act:name>
- <act:id type="guid">c696e41f7e625f0d1aaa571aaa63ff27</act:id>
+ <act:name>0420 Büroeinrichtung</act:name>
+ <act:id type="guid">573063d23b81fe3f9917d80fe6cc41e7</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0200</act:code>
+ <act:code>0420</act:code>
<act:slots>
<slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:key>tax-related</slot:key>
+ <slot:value type="integer">1</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0210 Maschinen</act:name>
- <act:id type="guid">e78eb3ebc1d52993a3cbf296629a77b2</act:id>
+ <act:name>0565 Dahrlehn</act:name>
+ <act:id type="guid">bd74fcb2d15fc7540ecc5ba8f27cbf48</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0210</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:code>0565</act:code>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0380 Sonst. Transportmittel</act:name>
- <act:id type="guid">de3856b6163806012bc7a6e6bf05da6b</act:id>
+ <act:name>0210 Maschinen</act:name>
+ <act:id type="guid">904b262e6f84659046267cad87ac5e90</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0380</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:code>0210</act:code>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>0400 Betriebsausstattung</act:name>
- <act:id type="guid">20ec7779960057114120047ecfc416bf</act:id>
+ <act:id type="guid">910d6c057660045a9958fb5a57ffc899</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -158,179 +130,88 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>0400</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0410 Geschäftsausstattung</act:name>
- <act:id type="guid">0e04b507455f116dc5b5f6d9bf87a70b</act:id>
+ <act:name>0430 Ladeneinrichtung</act:name>
+ <act:id type="guid">2876b41c069107076e7a18ec39bf4f9c</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0410</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- <slot>
- <slot:key>tax-related</slot:key>
- <slot:value type="integer">1</slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>0420 Büroeinrichtung</act:name>
- <act:id type="guid">dfd2898915e4d2d63b56fb7bf3b655ab</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>0420</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- <slot>
- <slot:key>tax-related</slot:key>
- <slot:value type="integer">1</slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>0430 Ladeneinrchtung</act:name>
- <act:id type="guid">6d12c0f0756c215427e5908c31831531</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
<act:code>0430</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">27356188a1963c1dbf943022441d095f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0440 Werkzeuge</act:name>
- <act:id type="guid">60e5fb52538964e339d2ad0a21631c6a</act:id>
+ <act:name>Finanzkonten 1</act:name>
+ <act:id type="guid">1b13a7614b5e84b0778963995e20d897</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0440</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:parent type="guid">fc3b1f110a6686f3d40bb0c41c0f8de0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0480 Geringwertige Wirtschaftsg. bis 410 Euro</act:name>
- <act:id type="guid">cb1fc584da899369ff73d8cd025d35b4</act:id>
+ <act:name>1100 Postbank</act:name>
+ <act:id type="guid">9fe8d61dac9cf62b3f12e6c71a4385b2</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0480</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:code>1100</act:code>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0565 Dahrlehn</act:name>
- <act:id type="guid">765400be7b46f5b08919117895c47cc7</act:id>
+ <act:name>1200 Bankkonto</act:name>
+ <act:id type="guid">875ec51cd332f3b75c15a2a9ca309ebd</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0565</act:code>
- <act:parent type="guid">e2e9b85bb92351303776f0693fddc205</act:parent>
+ <act:code>1200</act:code>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Finanz u. Privatkonten 1</act:name>
- <act:id type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:id>
+ <act:name>1590 Durchlaufende Posten</act:name>
+ <act:id type="guid">f048cb49a135a298d5df958a4c63ba22</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c3e9d2cb51af856b5cd8fcde6d05b704</act:parent>
+ <act:code>1590</act:code>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Abziehbare Vorsteuer</act:name>
- <act:id type="guid">05806d56cf670d96a2eefbc50789ffe9</act:id>
+ <act:name>1371 Gewinnermittlung §4/3 nicht Ergebniswirksam</act:name>
+ <act:id type="guid">58c8b84a785d7feac255d381943076df</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
+ <act:code>1371</act:code>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1571 Abziehbare VSt. 7%</act:name>
- <act:id type="guid">635b599a130b53d9cddc5528ce469029</act:id>
+ <act:id type="guid">7edc3c319713c53035b3e439ccec5e2b</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -338,11 +219,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1571</act:code>
- <act:parent type="guid">05806d56cf670d96a2eefbc50789ffe9</act:parent>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1575 Abziehbare VSt. 16%</act:name>
- <act:id type="guid">ff9ce96b018e817bc502fd19be3a16da</act:id>
+ <act:id type="guid">507b25d5d47d57ba115929b70a32fa5e</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -350,11 +231,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1575</act:code>
- <act:parent type="guid">05806d56cf670d96a2eefbc50789ffe9</act:parent>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1576 Abziehbare VStr. nach §13b UStG 16%</act:name>
- <act:id type="guid">397ca4b625da67d9077a8a77b25babce</act:id>
+ <act:name>1576 Abziehbare VStr. nach §13b UStG 16%</act:name>
+ <act:id type="guid">ac0fb64d0cfc2b88444527ce8c8682fe</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -362,32 +243,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1576</act:code>
- <act:parent type="guid">05806d56cf670d96a2eefbc50789ffe9</act:parent>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Forderungen</act:name>
- <act:id type="guid">fe6b59110039fe1f4fcdd7fc8bacf4e3</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>1400 Ford. a. Lieferungen und Leistungen</act:name>
- <act:id type="guid">c1a294af9626250949b5bbd8989156ad</act:id>
+ <act:id type="guid">2fe36b4ddde053387e42aa893a94b91b</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -395,178 +255,40 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1400</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe6b59110039fe1f4fcdd7fc8bacf4e3</act:parent>
+ <act:parent type="guid">1b13a7614b5e84b0778963995e20d897</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1000 Kasse</act:name>
- <act:id type="guid">7cee43f003b86dfdcce038096f6b51d2</act:id>
+ <act:name>Wareneingangs- u. Bestandskonten 3</act:name>
+ <act:id type="guid">a26df9927a82bcb58a1facb4cde6f221</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1000</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
+ <act:parent type="guid">fc3b1f110a6686f3d40bb0c41c0f8de0</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1100 Postbank</act:name>
- <act:id type="guid">d40e98b74f39ab3072675867772cf370</act:id>
+ <act:name>3120 Leistungen §13b UStG 16% Vorsteuer, 16% Umsatzsteuer</act:name>
+ <act:id type="guid">39c180a4e3647d347ebc3e16e984372b</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1100</act:code>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>1200 Bank</act:name>
- <act:id type="guid">64a6b88a61535980d27369fb4dcaef73</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>1200</act:code>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>1590 Durchlaufende Posten</act:name>
- <act:id type="guid">7e533a4fb3b79d86062c92b3490c3fe5</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>1590</act:code>
- <act:parent type="guid">4b5b80fd8c0649d3982b3bba12e7258d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>Wareneingangs- und Bestandskonten 3</act:name>
- <act:id type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:parent type="guid">c3e9d2cb51af856b5cd8fcde6d05b704</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>3000 Roh-, Hilfs- u. Betriebsstoffe</act:name>
- <act:id type="guid">7ba19127ad9b590caff84e09bb7fb48d</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>3000</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>3090 Energiestoffe (Fert.)</act:name>
- <act:id type="guid">8d9b3f35354427cf5fe68fee4efea188</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>3090</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>3120 Leistungen §13b UStG 16% Vorsteuer, 16% Umsatzsteuer</act:name>
- <act:id type="guid">00f8eb9b6add747daae7934d424c1b6c</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
<act:code>3120</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:parent>
+ <act:parent type="guid">a26df9927a82bcb58a1facb4cde6f221</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>3300 Wareneingang VSt. 7%</act:name>
- <act:id type="guid">baed753f62f88e4a6e0a172aa1f9b1a2</act:id>
- <act:type>ASSET</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>3300</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>3400 Wareneingang VSt. 16%</act:name>
- <act:id type="guid">2ea5196d25c707841fa7180f7fb02da6</act:id>
+ <act:id type="guid">01e4b246665a54d40466ba88f5d1d34e</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -580,11 +302,11 @@
<slot:value type="integer">1</slot:value>
</slot>
</act:slots>
- <act:parent type="guid">e33030ae758db9b6a3ce4defb8c458d5</act:parent>
+ <act:parent type="guid">a26df9927a82bcb58a1facb4cde6f221</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Passiva</act:name>
- <act:id type="guid">caeccc24b9818a798efe49173b4b871e</act:id>
+ <act:id type="guid">845b29bc14787bded30488e8d51eec0b</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -592,10 +314,16 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Passiva</act:description>
+ <act:slots>
+ <slot>
+ <slot:key>placeholder</slot:key>
+ <slot:value type="string">true</slot:value>
+ </slot>
+ </act:slots>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Umsatzsteuer</act:name>
- <act:id type="guid">a3d059e9afb301a695400885b554c1e3</act:id>
+ <act:id type="guid">dea7f32e6a447d2d1cd7048932c98265</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -608,11 +336,11 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
- <act:parent type="guid">caeccc24b9818a798efe49173b4b871e</act:parent>
+ <act:parent type="guid">845b29bc14787bded30488e8d51eec0b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1771 Umsatzsteuer 7%</act:name>
- <act:id type="guid">3401389dfb1956be5cca00030eb38891</act:id>
+ <act:id type="guid">d699c440f7817339d2fe60dd875520b6</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -620,21 +348,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1771</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1775 Umsatzsteuer 16%</act:name>
- <act:id type="guid">9f465d75df0f377cbc997540a970c1ad</act:id>
+ <act:id type="guid">55a2876edef147ed7631486de4af558c</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -642,11 +360,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1775</act:code>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1780 Umsatzsteuer-Vorauszahlung</act:name>
- <act:id type="guid">235bc197d68e05f385f902bacee75d1d</act:id>
+ <act:id type="guid">4b5e1c2b17024a7721d0955c9f140dd6</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -654,11 +372,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1780</act:code>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1781 Umsatzsteuer-Vorauszahlung 1/11</act:name>
- <act:id type="guid">5709612e10db36f4dc5666ba156d1ede</act:id>
+ <act:id type="guid">08793cd11dfca23d7b435a7338db02da</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -666,11 +384,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1781</act:code>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1786 Umsatzsteuer § 13b UStG 16%</act:name>
- <act:id type="guid">665fe8fd2a2c2e42e3813dfbb3b301a6</act:id>
+ <act:name>1786 Umsatzsteuer § 13b UStG 16%</act:name>
+ <act:id type="guid">8e1583dfe60365b756f5365741250001</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -678,21 +396,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1786</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>1790 Umsatzsteuer Vorjahr</act:name>
- <act:id type="guid">e8de87fddd36d0916ad25851ef2a84d9</act:id>
+ <act:id type="guid">635fe36261db8b9beda522420f564028</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -700,11 +408,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1790</act:code>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1791 Umsatzsteuer frühere Jahre</act:name>
- <act:id type="guid">4279dff926793bb4538e67b7ccbff49f</act:id>
+ <act:name>1791 Umsatzsteuer frühere Jahre</act:name>
+ <act:id type="guid">b2d79b416fee27d4d6a38643f6ad0d45</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -712,21 +420,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>1791</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">a3d059e9afb301a695400885b554c1e3</act:parent>
+ <act:parent type="guid">dea7f32e6a447d2d1cd7048932c98265</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Verbindlichkeiten</act:name>
- <act:id type="guid">c67a54c03377194e8c6f3cd972d625e8</act:id>
+ <act:id type="guid">a31fca8b7c5eb2cb0111f1f97696ac93</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -738,301 +436,128 @@
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">caeccc24b9818a798efe49173b4b871e</act:parent>
+ <act:parent type="guid">845b29bc14787bded30488e8d51eec0b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>0631 Verbindl. geg. Kreditinst. - Restlaufzeit bis 1 Jahr</act:name>
- <act:id type="guid">4c2a6c8bc25fe1eebf1ab0f6bc87ce59</act:id>
+ <act:name>1600 Verblk. aus Lieferungen u. Leistungen</act:name>
+ <act:id type="guid">1bf9f2675a36b278adcf6da68a7e4cbe</act:id>
<act:type>LIABILITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>0631</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>0640 Verbindl. geg. Kreditinst. - Restlaufzeit 1 bis 5 Jahre</act:name>
- <act:id type="guid">680113bdfca1b11c7b60c29da340839c</act:id>
- <act:type>LIABILITY</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>0640</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>0650 Verbindl. geg. Kreditinst. - Restlaufzeit größer als 5 Jahre</act:name>
- <act:id type="guid">0fd7bfeba29ef6257849614e2e9b87fb</act:id>
- <act:type>LIABILITY</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>0650</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>1600 Verbindli. Lief. u. Leistungen</act:name>
- <act:id type="guid">5e785d84355c8c7d5b14ff6f26fe5133</act:id>
- <act:type>LIABILITY</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
<act:code>1600</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
+ <act:parent type="guid">a31fca8b7c5eb2cb0111f1f97696ac93</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1605 Verbindl. a. LuL z. allg. Umsatzsteuersatz (EÜR)</act:name>
- <act:id type="guid">2a3bab7d7db764c435fb9b2f2459f295</act:id>
- <act:type>LIABILITY</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>1605</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>1606 Verbindl. a. LuL z. erm. Umsatzsteuersatz</act:name>
- <act:id type="guid">48d70d0bcec45049ceed70077f474e50</act:id>
- <act:type>LIABILITY</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>1606</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">c67a54c03377194e8c6f3cd972d625e8</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>Erlöskonten 26/8</act:name>
- <act:id type="guid">633c73003e9120caebb3e1eebc7e2c60</act:id>
+ <act:name>Erlöse u. Erträge 2/8</act:name>
+ <act:id type="guid">3f31fc649f19b5201f22f7648c3f7107</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:description>Erfolgskonto Erträge</act:description>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2600 Erträge aus Beteiligunen</act:name>
- <act:id type="guid">8e0c69216a78e845a97b732496b962ce</act:id>
+ <act:name>Erlöskonten 8</act:name>
+ <act:id type="guid">fd04e181ab83b37b80a4609b0806e954</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2600</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:parent type="guid">3f31fc649f19b5201f22f7648c3f7107</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2650 sonstige Zinsen und ähnliche Erträge</act:name>
- <act:id type="guid">b6ff9b9ab07cde4dc9942387267cb941</act:id>
+ <act:name>8400 Erlöse USt. 16%</act:name>
+ <act:id type="guid">d75d796e879b0ad9b2732d698ae9e838</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2650</act:code>
+ <act:code>8400</act:code>
<act:slots>
<slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:key>tax-related</slot:key>
+ <slot:value type="integer">1</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:parent type="guid">fd04e181ab83b37b80a4609b0806e954</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2657 Zinserträge-betriebl. Steuern</act:name>
- <act:id type="guid">a93010d68960a28b972763a6904292a1</act:id>
+ <act:name>8300 Erlöse USt. 7%</act:name>
+ <act:id type="guid">0c82316c2aecaa02ce1b4ecb223f6f5d</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2657</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:code>8300</act:code>
+ <act:parent type="guid">fd04e181ab83b37b80a4609b0806e954</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2660 Erträge aus Kursdifferenzen</act:name>
- <act:id type="guid">fe0eb06f6f2d3dd028ea20efd8c316a0</act:id>
+ <act:name>Ertragskonten 2</act:name>
+ <act:id type="guid">4f552b822559c82eaa816d0049f70064</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2660</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:parent type="guid">3f31fc649f19b5201f22f7648c3f7107</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2670 Diskonterträge</act:name>
- <act:id type="guid">0fa37d8e8489f32489640e3df6111f44</act:id>
+ <act:name>2650 sonstige Zinsen und ähnliche Erträge</act:name>
+ <act:id type="guid">cc08ab7c747853f5f7ea6b384fdd8b4d</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2670</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:code>2650</act:code>
+ <act:parent type="guid">4f552b822559c82eaa816d0049f70064</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2680 Zinsähnliche Erträge</act:name>
- <act:id type="guid">0bdd1473af64d651f8af46a00a0b4918</act:id>
+ <act:name>2500 Außerordentliche Erträge</act:name>
+ <act:id type="guid">5634359999c43ba58697553d1d905c4c</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2680</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:code>2500</act:code>
+ <act:parent type="guid">4f552b822559c82eaa816d0049f70064</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2700 Sonstige Erträge</act:name>
- <act:id type="guid">d6ee5e0b77a3bfa07b696876443fa0dc</act:id>
+ <act:name>2700 Sonstige Erträge</act:name>
+ <act:id type="guid">067716095fef7e694a2e0c40f1eaaefd</act:id>
<act:type>INCOME</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1040,178 +565,27 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>2700</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
+ <act:parent type="guid">4f552b822559c82eaa816d0049f70064</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2750 Grundstückserträge</act:name>
- <act:id type="guid">07a8ec00558eb91eae7d5dbab55f1a6d</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>2750</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>8200 Erlöse</act:name>
- <act:id type="guid">e77e26756c652bdfb573385f84bbb975</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>8200</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>8300 Erlöse 7% USt.</act:name>
- <act:id type="guid">d3d5aa0c27a4a8eb35de841423d70458</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>8300</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>8400 Erlöse USt. 16%</act:name>
- <act:id type="guid">65633b6058c5aa2da2748427a6edbcdc</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>8400</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- <slot>
- <slot:key>tax-related</slot:key>
- <slot:value type="integer">1</slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>8600 Sonstige Erlöse betreibl. u. regalmäßig</act:name>
- <act:id type="guid">d3ad31f7930e4c95c21ae72b7e5d3c49</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>8600</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>8800 Erlöse aus Anlagenverkäufen</act:name>
- <act:id type="guid">18d64cc360632bdb85aa1719e70a5d20</act:id>
- <act:type>INCOME</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>8800</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">633c73003e9120caebb3e1eebc7e2c60</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>betriebliche Aufwendungen 2/4</act:name>
- <act:id type="guid">e9490706606134bbd40d9d010a276746</act:id>
+ <act:name>Aufwendungen 2/4</act:name>
+ <act:id type="guid">be324e400d3b67510f89afd18de776e3</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:description>Erfolgskonto Aufwendungen</act:description>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>20 Außerordentliche Aufwendungen</act:name>
- <act:id type="guid">931bdec43029b8dc311e0060f4caa1e2</act:id>
+ <act:name>Abschreibungen</act:name>
+ <act:id type="guid">ad3f063a8200c1faa0331e2d9eb3ae04</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1223,235 +597,113 @@
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2000 außerordentliche Aufwendungen</act:name>
- <act:id type="guid">9643b081bfd27af8a9b5a4bc9ff24178</act:id>
+ <act:name>4855 Sofortabschreibung GWG</act:name>
+ <act:id type="guid">cf214c888424ce036704bd526650a4c1</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2000</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">931bdec43029b8dc311e0060f4caa1e2</act:parent>
+ <act:code>4855</act:code>
+ <act:parent type="guid">ad3f063a8200c1faa0331e2d9eb3ae04</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2010 Betriebsfremde Aufwendungen (soweit . außerord.)</act:name>
- <act:id type="guid">e1cd5c9443183fccb26860ae15fb6655</act:id>
+ <act:name>Kfz-Kosten</act:name>
+ <act:id type="guid">8488954a5834d5484ed57439a0d43305</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2010</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">931bdec43029b8dc311e0060f4caa1e2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>2020 Periodenfremde Aufwend. (soweit n. außerordentl.)</act:name>
- <act:id type="guid">63dd8bcf63e2643078047aef87b7c94e</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>2020</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">931bdec43029b8dc311e0060f4caa1e2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>21 Zinsen</act:name>
- <act:id type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2100 Zinsen und ähnl. Aufwendungen</act:name>
- <act:id type="guid">fb9792373cfb520942700505ac79860e</act:id>
+ <act:name>4510 Kfz-Steuer</act:name>
+ <act:id type="guid">4355e4bceaa024b71efb3223ac6576c0</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2100</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4510</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2107 Zinsaufwendung-betriebl. Steuern §223aAO</act:name>
- <act:id type="guid">1c739c342d14384c73d8bc478a24249c</act:id>
+ <act:name>4520 Kfz-Versicherungen</act:name>
+ <act:id type="guid">4395e7b49fc7d34db620e6249836d747</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2107</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4520</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2110 Zinsaufwendungen für kurzfr. Verbindlichkeiten</act:name>
- <act:id type="guid">96c06fb2953315457bcd4ab72aa01f7d</act:id>
+ <act:name>4530 laufende Kfz-Betriebskosten</act:name>
+ <act:id type="guid">9bcbd663916f135d81b8eff6dc8b8819</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2110</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4530</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2120 Zinsaufwendungen f. langf. Verbindl.</act:name>
- <act:id type="guid">8e945eb01951079ce978598f72d5687a</act:id>
+ <act:name>4540 Kfz-Reparaturen</act:name>
+ <act:id type="guid">5359164e661dd33c4bdb98b5149b07d1</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2120</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4540</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2121 Zinsaufwendungen für Finanzierung</act:name>
- <act:id type="guid">0b1810b482012f63db8ae1a99c6d1cde</act:id>
+ <act:name>4570 Fremdfahrzeuge</act:name>
+ <act:id type="guid">3b92417001893aa765edaa7109b2d48a</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2121</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4570</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>2125 Zinsaufwenden f. Gebäude, die z. Betriebsverm. gehören</act:name>
- <act:id type="guid">20d25b99f835812b0792fb687ce1be13</act:id>
+ <act:name>4580 sonstige Kfz-Kosten</act:name>
+ <act:id type="guid">e4c3ff3a921558869191a648aeb9b0e3</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>2125</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">d47d8bf1db8229e2533aa9d82751dc7e</act:parent>
+ <act:code>4580</act:code>
+ <act:parent type="guid">8488954a5834d5484ed57439a0d43305</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>41 Personalkosten</act:name>
- <act:id type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:id>
+ <act:name>Personalkosten</act:name>
+ <act:id type="guid">43953979cf408743814cb6887d5ec022</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1463,126 +715,24 @@
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4110 Löhne</act:name>
- <act:id type="guid">4c873ca5041aa34af0969e185decbb5c</act:id>
+ <act:name>4120 Gehälter</act:name>
+ <act:id type="guid">8f21199517fcfd70ad2ad6aaa3e714b6</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4110</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4120 Gehälter</act:name>
- <act:id type="guid">174391313c40c56ef0ead182ceeb8f36</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
<act:code>4120</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
+ <act:parent type="guid">43953979cf408743814cb6887d5ec022</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4125 Ehegattengehalt</act:name>
- <act:id type="guid">67811422f39330a7c78525c127b4a548</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4125</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4126 Tantiemen</act:name>
- <act:id type="guid">15aba38f05735a26e6db6c6e68ab1201</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4126</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4127 Geschäftsführergehälter</act:name>
- <act:id type="guid">182ca5671422c16f52deff3c86d9cd85</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4127</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4130 gesetzliche soziale Aufwendungen</act:name>
- <act:id type="guid">e7b8073e4a1f06476b8725c6b9137c66</act:id>
+ <act:id type="guid">46ba645d075b6a1f3a38824d812f8818</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1590,11 +740,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4130</act:code>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
+ <act:parent type="guid">43953979cf408743814cb6887d5ec022</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4165 Aufwendungen für Altersvorsorge</act:name>
- <act:id type="guid">39d7cf1dda72c892c9f66dea9d554447</act:id>
+ <act:name>4165 Aufwendungen für Altersvorsorge</act:name>
+ <act:id type="guid">e89eafba1acc736a7ba74882a7f8c836</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1602,21 +752,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4165</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
+ <act:parent type="guid">43953979cf408743814cb6887d5ec022</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4170 Vermögenswirksame Leistungen</act:name>
- <act:id type="guid">9ffd7d56af5adf2f9e4aac3f7c3f04af</act:id>
+ <act:name>4170 Vermögenswirksame Leistungen</act:name>
+ <act:id type="guid">88bc69e1ff8977cd70c52567dde8107d</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1624,21 +764,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4170</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
+ <act:parent type="guid">43953979cf408743814cb6887d5ec022</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4190 Aushilfslöhne</act:name>
- <act:id type="guid">e69fb020c1e9b89ac85aae42c357c05d</act:id>
+ <act:name>4190 Aushilfslöhne</act:name>
+ <act:id type="guid">d74350b9ad5583b533fd906ec837d9fe</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1646,86 +776,28 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4190</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
+ <act:parent type="guid">43953979cf408743814cb6887d5ec022</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4199 Lohnsteuer für Aushilfen</act:name>
- <act:id type="guid">ce2b5b5ce664ffeb57dea687f0dbaaa0</act:id>
+ <act:name>Raumkosten</act:name>
+ <act:id type="guid">9adef6f318a931fbb8519a823e2c20e8</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4199</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">9390cb3c25b3d0e1d419291b9a0c06a2</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>42 Raumkosten</act:name>
- <act:id type="guid">cfc8034a196524419255c1ab9636f43d</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4200 Raumkosten</act:name>
- <act:id type="guid">8c266f1f9f5946e9724e86f9d08ae155</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4200</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4210 Miete und Nebenkosten</act:name>
- <act:id type="guid">9cb27fcec125db10f8768257f57cde09</act:id>
+ <act:id type="guid">b6e84a2fcf1754f1f6f1f71913f03a1d</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1733,55 +805,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4210</act:code>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
+ <act:parent type="guid">9adef6f318a931fbb8519a823e2c20e8</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4220 Pacht</act:name>
- <act:id type="guid">b32a00325c0058a3d7f82f2d3b451335</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4220</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4230 Heizung</act:name>
- <act:id type="guid">b860bc5ddee580c464d06dae5766ef18</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4230</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4240 Gas, Wasser, Strom (Verwaltung, Vertrieb)</act:name>
- <act:id type="guid">aba35089b8810db823aa270492b31d98</act:id>
+ <act:id type="guid">d41823e7c279286dd74c6ec757dcb305</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1789,11 +817,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4240</act:code>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
+ <act:parent type="guid">9adef6f318a931fbb8519a823e2c20e8</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4250 Reinigung</act:name>
- <act:id type="guid">a743360e77143cca0bcf326ad9433e0e</act:id>
+ <act:id type="guid">db313359a146b610ce80a36dde18bf01</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1801,55 +829,40 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4250</act:code>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
+ <act:parent type="guid">9adef6f318a931fbb8519a823e2c20e8</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4260 Instandhaltung betriebl. Räume</act:name>
- <act:id type="guid">75648dcc2b4e0c0bcd111d3409d4c2d8</act:id>
+ <act:name>Reparatur/Instandhaltung</act:name>
+ <act:id type="guid">accaec28a4afcf3c82570da4c9343c2d</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4260</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4280 Sonstige Raumkosten</act:name>
- <act:id type="guid">0c323b882bfd5936a3fc39d11bd630b9</act:id>
+ <act:name>4805 Reparatur u. Instandh. von Anlagen/Maschinen u. Betriebs- u. Geschäftsausst.</act:name>
+ <act:id type="guid">b5d6461bb3028d13faa8bee2981925a1</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4280</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">cfc8034a196524419255c1ab9636f43d</act:parent>
+ <act:code>4805</act:code>
+ <act:parent type="guid">accaec28a4afcf3c82570da4c9343c2d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>43 Versicherungen/Beiträge/Steuern/Sonstige Ausgaben</act:name>
- <act:id type="guid">3538f04e96238eb452b5891249f272af</act:id>
+ <act:name>Versicherungsbeiträge</act:name>
+ <act:id type="guid">709bf14d69164a6c2a48e6c0e13ece37</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1861,16 +874,12 @@
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4360 Versicherungen</act:name>
- <act:id type="guid">134b276f65693dd1c468b0edc3a7b8d7</act:id>
+ <act:id type="guid">7484251f3d5fc7ec71419b2fba733a78</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1878,11 +887,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4360</act:code>
- <act:parent type="guid">3538f04e96238eb452b5891249f272af</act:parent>
+ <act:parent type="guid">709bf14d69164a6c2a48e6c0e13ece37</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4380 Beiträge</act:name>
- <act:id type="guid">89a2b2eade7d98d333a98c31d0f9dd7e</act:id>
+ <act:name>4380 Beiträge</act:name>
+ <act:id type="guid">f2b1ad75fd3b7fc4473972a9c2675cbf</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1890,21 +899,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4380</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">3538f04e96238eb452b5891249f272af</act:parent>
+ <act:parent type="guid">709bf14d69164a6c2a48e6c0e13ece37</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4390 sonstige Ausgaben</act:name>
- <act:id type="guid">d42da1bdc3e58034647ac294aad509f3</act:id>
+ <act:id type="guid">a2d552e480b95123e90be434b3ac9653</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1912,11 +911,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4390</act:code>
- <act:parent type="guid">3538f04e96238eb452b5891249f272af</act:parent>
+ <act:parent type="guid">709bf14d69164a6c2a48e6c0e13ece37</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4396 steuerlich abzugsfähige Verspätungszuschläge und Zwandsgelder</act:name>
- <act:id type="guid">0d644e40814115dcd0678662e67536be</act:id>
+ <act:name>4396 steuerlich abzugsfähige Verspätungszuschläge und Zwandsgelder</act:name>
+ <act:id type="guid">0c73c5dc5e72bb4962b83ddc85991101</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1924,21 +923,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4396</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">3538f04e96238eb452b5891249f272af</act:parent>
+ <act:parent type="guid">709bf14d69164a6c2a48e6c0e13ece37</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>45 Kfz-Kosten</act:name>
- <act:id type="guid">b00e7c59c9febf82aaa846991b89ec78</act:id>
+ <act:name>Werbe-/Reisekosten</act:name>
+ <act:id type="guid">a657ade965a1429d44d830d3832bf9aa</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -1950,175 +939,12 @@
<slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4500 Fahrzeugkosten</act:name>
- <act:id type="guid">ef3be8ea5244b1b7df25375888b75441</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4500</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4510 Kfz-Steuer</act:name>
- <act:id type="guid">c56712faf2570357c65db9c76e95eb99</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4510</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4520 Kfz-Versicherungen</act:name>
- <act:id type="guid">bb95498eccf54627c35d2f5512b83786</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4520</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4530 laufende Kfz-Betriebskosten</act:name>
- <act:id type="guid">cdb3e39478c71e2d8ab8dce5c7b4ad50</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4530</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4540 Kfz-Reparaturen</act:name>
- <act:id type="guid">52d0181de7dab5222f13441f0b6d8afe</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4540</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4550 Garagenmiete</act:name>
- <act:id type="guid">e627bd140c8e88b424ca092977321600</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4550</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4570 Frendfahrzeuge</act:name>
- <act:id type="guid">058a0613f6db81e289dfcdedfc5c7cd3</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4570</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4580 sonstige Kfz-Kosten</act:name>
- <act:id type="guid">f92944d503e8eb51d1cebe339cf3de91</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4580</act:code>
- <act:parent type="guid">b00e7c59c9febf82aaa846991b89ec78</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>46 Werbe-/Reisekosten</act:name>
- <act:id type="guid">fe902486a9d04119d724a7e21d018b9c</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4600 Werbe- u. Reisekosten</act:name>
- <act:id type="guid">b6d0b77c7b1a016990c562ff8625b8e3</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4600</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4610 Werbekosten</act:name>
- <act:id type="guid">b65e5e6a1894233f576f9148b337dc5a</act:id>
+ <act:id type="guid">2d90f835fcb74d7a77b4a2a2b40c777a</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2126,99 +952,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4610</act:code>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
+ <act:parent type="guid">a657ade965a1429d44d830d3832bf9aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4630 Geschenke bis 35 Euro abzugsfähig</act:name>
- <act:id type="guid">f0dd2c6203b1b42db1c8fae8ad416fd9</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4630</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4635 Geschenke über 35 Euro nicht abzugsf.</act:name>
- <act:id type="guid">3fe2c81aa6b09df860a0fe7586a49820</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4635</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4640 Repräsentationskosten</act:name>
- <act:id type="guid">a115fc8b9a4e9f894987bc697048a945</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4640</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4650 Bewirtungskosten</act:name>
- <act:id type="guid">40d2f673ead25815fdba786f7d3b4b37</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4650</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4653 Aufmerksamkeiten</act:name>
- <act:id type="guid">21a06c0b16c9fb364776ead4592275de</act:id>
+ <act:id type="guid">790770c5f93cff7d585bca1627446716</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2226,77 +964,23 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4653</act:code>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
+ <act:parent type="guid">a657ade965a1429d44d830d3832bf9aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4654 nicht abzugsf. Bewirtungskosten</act:name>
- <act:id type="guid">d38c448d3925850e22e02ccd809f0c0a</act:id>
+ <act:name>4665 nicht abzugsfähige Betriebsausg. aus Werbe-, Repräs.- u. Reisekosten</act:name>
+ <act:id type="guid">235a6225c2c7d2ffa865345e78cae283</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4654</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4660 Reisekosten Arbeitnehmer</act:name>
- <act:id type="guid">1c1d11f6b35e9e9ccfd5e23a50a47d1b</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4660</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4665 nicht abzugsfähige Betriebsausg. aus Werbe-, Repräs.- u. Riesekosten</act:name>
- <act:id type="guid">65c19851a3d6a2e44364bc068dd4f45b</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
<act:code>4665</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
+ <act:parent type="guid">a657ade965a1429d44d830d3832bf9aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4670 Reisekosten Unernehmer</act:name>
- <act:id type="guid">e4e6b10271cc52a5a7b56e12e537ef31</act:id>
+ <act:id type="guid">dda3ae53573975cd05fab1d3cdf40806</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2304,393 +988,28 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4670</act:code>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
+ <act:parent type="guid">a657ade965a1429d44d830d3832bf9aa</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4676 Reisekosten Untern. Übernachtungsaufw.</act:name>
- <act:id type="guid">0134f2b9e3c5f2ef748ee00f292b0d26</act:id>
+ <act:name>verschiedene Kosten</act:name>
+ <act:id type="guid">d0c00095e4b00f9f25253307be05e885</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4676</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4678 Kilometergelderstatt. (Wohn.-Arbeitsst.abziehb.Teil)</act:name>
- <act:id type="guid">3f11e669a2f604c060bed83fc449b278</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4678</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4679 Fahrten zw. Wohn- u. Arbeitsstätte (nicht abziehb.Teil)</act:name>
- <act:id type="guid">1562e90f0bb40af762251c12ef744d98</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4679</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">fe902486a9d04119d724a7e21d018b9c</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>47 Kosten Warenabgabe</act:name>
- <act:id type="guid">19df2cdbfe931cbf239926edd338abf5</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
<slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4700 Kosten der Warenabgabe</act:name>
- <act:id type="guid">22366b48ec4d671ce84850b5791ba2c5</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4700</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">19df2cdbfe931cbf239926edd338abf5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4710 Verpackungsmaterial</act:name>
- <act:id type="guid">137ce08e9d4443361942809b5d968dd0</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4710</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">19df2cdbfe931cbf239926edd338abf5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4730 Ausgangsfracht</act:name>
- <act:id type="guid">dfc21ba82f3248eb702b4b18ce75532b</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4730</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">19df2cdbfe931cbf239926edd338abf5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4750 Transportversicherung</act:name>
- <act:id type="guid">49b51ddf0e666aba43c2771065650eef</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4750</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">19df2cdbfe931cbf239926edd338abf5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4790 Aufwand für Gewährleistung</act:name>
- <act:id type="guid">395f2ca1dbb3afd3244e37c02afcae74</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4790</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">19df2cdbfe931cbf239926edd338abf5</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>48 Abschreibungen</act:name>
- <act:id type="guid">2ce95687c834a53309dd8bb4b83896bd</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4855 Sofortabschreibung GWG</act:name>
- <act:id type="guid">70d40d23a2578ec7edfe18d39e58b0c3</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4855</act:code>
- <act:parent type="guid">2ce95687c834a53309dd8bb4b83896bd</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4860 Abschreibungen auf aktivierte GWG</act:name>
- <act:id type="guid">39bf3606782053117009dc552dae1467</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4860</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">2ce95687c834a53309dd8bb4b83896bd</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4870 Abschreibungen auf Finanzanlagen</act:name>
- <act:id type="guid">ae81be20a419bc9f8eecf2decd621ec4</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4870</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">2ce95687c834a53309dd8bb4b83896bd</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>48 Reparatur/Instandhaltung</act:name>
- <act:id type="guid">a0c8478748ac62d9ab83f0d2dd3e3447</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4805 Reparatur u. Instandh. von Anlagen/Maschinen u. Betriebs- u. Geschäftsausst.</act:name>
- <act:id type="guid">807baaf9d3feaf3fc9c6156373b18f61</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4805</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">a0c8478748ac62d9ab83f0d2dd3e3447</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>49 verschiedene Kosten</act:name>
- <act:id type="guid">ea43a932bb71ff1b4e61530363e20a11</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">e9490706606134bbd40d9d010a276746</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4905 Sonst. Aufw. betriebl. und regelmäßig</act:name>
- <act:id type="guid">e74ac88619e4f8f458fc4815492d5cb2</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4905</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>4909 Fremdleistungen</act:name>
- <act:id type="guid">2062c2b58d7cae79fa76e9fb4736fd43</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4909</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
<act:name>4910 Porto</act:name>
- <act:id type="guid">5416949778f2f8e6f1f291b4fcb74152</act:id>
+ <act:id type="guid">b84666b6b2d17f4be4a2cc15e595b30d</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2698,11 +1017,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4910</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4920 Telekom</act:name>
- <act:id type="guid">ff173d035f04b7b31530385cfd10c113</act:id>
+ <act:id type="guid">892bb0974aa6c422f63b5df5354e8f7f</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2710,11 +1029,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4920</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4921 Mobilfunk D2</act:name>
- <act:id type="guid">43b58170435cabd592b83a0fe7fdd756</act:id>
+ <act:id type="guid">20a13b07d90c5b385e78190525439aa2</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2722,11 +1041,11 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4921</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>4922 Internet</act:name>
- <act:id type="guid">641c002a3040e5aadeb759ba48467d51</act:id>
+ <act:id type="guid">4d57d9103ab150ad4f01bc7a918fd0cc</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2734,255 +1053,153 @@
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:code>4922</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4925 Telefax</act:name>
- <act:id type="guid">5e746bc740988ab2fbe4ef7ed728e7e7</act:id>
+ <act:name>4930 Bürobedarf</act:name>
+ <act:id type="guid">ac4d7c452835096c373f1a94dc3104f4</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4925</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4930</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4930 Bürobedarf</act:name>
- <act:id type="guid">35613de8b2b2fdbd2671f916e523cdff</act:id>
+ <act:name>4940 Zeitschriften, Bücher</act:name>
+ <act:id type="guid">1bac306450e7bc0619e42c11ab791204</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4930</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4940</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4940 Zeitschriften, Bücher</act:name>
- <act:id type="guid">2f8f83038e41d0f6ab785d2e644023ee</act:id>
+ <act:name>4945 Fortbildungskosten</act:name>
+ <act:id type="guid">6be35acc206b144ee23c07086bc7a856</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4940</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4945</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4945 Fortbildungskosten</act:name>
- <act:id type="guid">97deccc16af068166391ac76c08e6fae</act:id>
+ <act:name>4955 Buchführungskosten</act:name>
+ <act:id type="guid">25afa584627e0c0e8681bd8a82a77d14</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4945</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4955</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4950 Rechts- u. Beratungskosten</act:name>
- <act:id type="guid">4d2d4b34edf056daabb53e99b97c74a8</act:id>
+ <act:name>4957 Abschluß- u. Prüfungskosten</act:name>
+ <act:id type="guid">bf093094a55c036a193357ebcafcab67</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4950</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4957</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4955 Buchführungskosten</act:name>
- <act:id type="guid">d0ea7caf66a4ac31d5e9e5e424a85928</act:id>
+ <act:name>4970 Nebenkosten des Geldverkehrs</act:name>
+ <act:id type="guid">4f476c9b65684d56630db45690b9d4fc</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4955</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4970</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4957 Abschluß- u. Prüfungskosten</act:name>
- <act:id type="guid">23279a8dc7af902ad4da791cb3d3ad82</act:id>
+ <act:name>4985 Werkzeuge und Kleingeräte</act:name>
+ <act:id type="guid">a5b36148c3fc06080973a5d25f28225b</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4957</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>4985</act:code>
+ <act:parent type="guid">d0c00095e4b00f9f25253307be05e885</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4960 Mieten für Einrichtungen</act:name>
- <act:id type="guid">f163fb4bd61c4f0504ea335b7f4eaff3</act:id>
+ <act:name>Zinsaufwendungen</act:name>
+ <act:id type="guid">8d2641f8bbc41aa863274bb496002f3e</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4960</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:parent type="guid">be324e400d3b67510f89afd18de776e3</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4970 Nebenkosten des Geldverkehrs</act:name>
- <act:id type="guid">42005e431d0773b0e398c6753f10f8a4</act:id>
+ <act:name>2110 Zinsaufwendungen für kurzfristige Verbindlichkeiten</act:name>
+ <act:id type="guid">2d20e36f8abb4e366c8e3e2783bdafab</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4970</act:code>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>2110</act:code>
+ <act:parent type="guid">8d2641f8bbc41aa863274bb496002f3e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4980 Betriebsbedarf</act:name>
- <act:id type="guid">ad84142e46c3aef4bf82eff774261b9a</act:id>
+ <act:name>2121 Zinsaufwendungen für KFZ Finanzierung</act:name>
+ <act:id type="guid">17651501792b93b06832634462ddddae</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4980</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
+ <act:code>2121</act:code>
+ <act:parent type="guid">8d2641f8bbc41aa863274bb496002f3e</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4985 Werkzeuge und Kleingeräte</act:name>
- <act:id type="guid">44d886bd8e1c058810673c768f89b5d9</act:id>
- <act:type>EXPENSE</act:type>
+ <act:name>Anfangsbestand 9</act:name>
+ <act:id type="guid">2d4eb2e0ef3bab0ac50b87c84babcf5d</act:id>
+ <act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>4985</act:code>
+ <act:description>Saldenvortragskonten</act:description>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>4990 Kalkulatorischer Unternehmerlohn</act:name>
- <act:id type="guid">f8f2c5dc02029f7f5e5cd15bc810eda6</act:id>
- <act:type>EXPENSE</act:type>
- <act:commodity>
- <cmdty:space>ISO4217</cmdty:space>
- <cmdty:id>EUR</cmdty:id>
- </act:commodity>
- <act:commodity-scu>100</act:commodity-scu>
- <act:code>4990</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">ea43a932bb71ff1b4e61530363e20a11</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
- <act:name>Privatkonten</act:name>
- <act:id type="guid">997a2671d83b4b252f7542f6dc5cd847</act:id>
+ <act:name>Saldenvortragskonten</act:name>
+ <act:id type="guid">26c3f10c1c7621661c1b813d6141280d</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
@@ -2995,216 +1212,148 @@
<slot:value type="string">true</slot:value>
</slot>
</act:slots>
+ <act:parent type="guid">2d4eb2e0ef3bab0ac50b87c84babcf5d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1800 Privatentnahme allgemein</act:name>
- <act:id type="guid">55281d17fb566b575b727ee6e8f1ec7e</act:id>
+ <act:name>9000 Saldenvortrag Sachkonten</act:name>
+ <act:id type="guid">fa346eee1add66248bff420aafeebebb</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1800</act:code>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
+ <act:code>9000</act:code>
+ <act:parent type="guid">26c3f10c1c7621661c1b813d6141280d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1810 Privatsteuern</act:name>
- <act:id type="guid">afa1e85d38cf2445b0f1daecd086f6ef</act:id>
+ <act:name>9008 Saldenvorträge Debitoren</act:name>
+ <act:id type="guid">1f36ecbf065faa2b25a0749ceee72efa</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1810</act:code>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
+ <act:code>9008</act:code>
+ <act:parent type="guid">26c3f10c1c7621661c1b813d6141280d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1820 Sonderausgaben beschränkt abzugsfähig</act:name>
- <act:id type="guid">ce4de668631a2db9f0d6368c7972ffa8</act:id>
+ <act:name>9009 Saldenvorträge Kreditoren</act:name>
+ <act:id type="guid">a6c754f12d0b9129790d9f52c5361778</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1820</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
+ <act:code>9009</act:code>
+ <act:parent type="guid">26c3f10c1c7621661c1b813d6141280d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1830 Sonderausgaben ungeschränkt abzugsfähig</act:name>
- <act:id type="guid">ba5a5fb54e925708f5c711ae9e4d4407</act:id>
+ <act:name>Privatkonten 1</act:name>
+ <act:id type="guid">1888a7d2fbbdede8446090a31651565f</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1830</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1850 Außergewöhnliche Belastungen</act:name>
- <act:id type="guid">ac4972c2dad0db60c6ec8931c1f0c231</act:id>
+ <act:name>Privatentnahmen/-einlagen</act:name>
+ <act:id type="guid">b9ae1b059749ea81c757a9adad39db1b</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1850</act:code>
<act:slots>
<slot>
<slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
+ <slot:value type="string">true</slot:value>
</slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
</act:slots>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
+ <act:parent type="guid">1888a7d2fbbdede8446090a31651565f</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>1890 Privateinlagen</act:name>
- <act:id type="guid">587523463509dc4cfa095efa8fba2e9f</act:id>
+ <act:name>1800 Privatentnahme allgemein</act:name>
+ <act:id type="guid">0e6b8f9c973149c8d1c00e40919e9e21</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>1890</act:code>
- <act:parent type="guid">997a2671d83b4b252f7542f6dc5cd847</act:parent>
+ <act:code>1800</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>Vortragskonten 9</act:name>
- <act:id type="guid">bef9d3186a962ce240064a85eb2e18fd</act:id>
+ <act:name>1810 Privatsteuern</act:name>
+ <act:id type="guid">fff2b92b43dc9d9690a7e5c365d2baf6</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">true</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
+ <act:code>1810</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>9000 Saldenvortrag Sachkonten</act:name>
- <act:id type="guid">0a6ab6b6ff7c8169f7464b2ddd753c24</act:id>
+ <act:name>1820 Sonderausgaben beschränkt abzugsfähig</act:name>
+ <act:id type="guid">5c008564ba99d0dfe6f20166adde5e6c</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>9000</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">bef9d3186a962ce240064a85eb2e18fd</act:parent>
+ <act:code>1820</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>9008 Saldenvorträge Debitoren</act:name>
- <act:id type="guid">2562d3d7fb038d6bb1eb25d61f183af6</act:id>
+ <act:name>1830 Sonderausgaben unbeschränkt abzugsfähig</act:name>
+ <act:id type="guid">d89a53718b4753ac5407b38ab43f1339</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>9008</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">bef9d3186a962ce240064a85eb2e18fd</act:parent>
+ <act:code>1830</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>9009 Saldenvorträge Kreditoren</act:name>
- <act:id type="guid">48ed6e9c05d6397cbe7742074dd644de</act:id>
+ <act:name>1850 Außergewöhnliche Belastungen</act:name>
+ <act:id type="guid">ab2c3c1b68e9c21ca3bce32c729c5cdc</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>9009</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">bef9d3186a962ce240064a85eb2e18fd</act:parent>
+ <act:code>1850</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
- <act:name>9090 Summenvortragskonto</act:name>
- <act:id type="guid">2bf135942ec9bfd85b42450654e8bb63</act:id>
+ <act:name>1890 Privateinlagen</act:name>
+ <act:id type="guid">4057a69542c170211849f7705354aadb</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
- <act:code>9090</act:code>
- <act:slots>
- <slot>
- <slot:key>placeholder</slot:key>
- <slot:value type="string">false</slot:value>
- </slot>
- <slot>
- <slot:key>notes</slot:key>
- <slot:value type="string"></slot:value>
- </slot>
- </act:slots>
- <act:parent type="guid">bef9d3186a962ce240064a85eb2e18fd</act:parent>
+ <act:code>1890</act:code>
+ <act:parent type="guid">b9ae1b059749ea81c757a9adad39db1b</act:parent>
</gnc:account>
</gnc-account-example>
Modified: gnucash/branches/deprecated-cleanup/autogen.sh
===================================================================
--- gnucash/branches/deprecated-cleanup/autogen.sh 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/autogen.sh 2006-07-30 04:57:40 UTC (rev 14581)
@@ -187,6 +187,9 @@
dr=${srcdir}
+echo "Creating $dr/po/POTFILES.in ..."
+test -r $dr/po/POTFILES.in || touch $dr/po/POTFILES.in
+
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
@@ -199,6 +202,9 @@
echo "Ensure $dr/aclocal.m4 is writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+echo "Ensure $dr/po/POTFILES.in is writable ..."
+test -r $dr/po/POTFILES.in && chmod u+w $dr/po/POTFILES.in
+
echo "Running ${INTLTOOLIZE} --force --copy ..."
${INTLTOOLIZE} --force --copy || \
{ echo "**Error**: ${INTLTOOLIZE} failed."; exit 1; }
Modified: gnucash/branches/deprecated-cleanup/configure.in
===================================================================
--- gnucash/branches/deprecated-cleanup/configure.in 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/configure.in 2006-07-30 04:57:40 UTC (rev 14581)
@@ -103,10 +103,10 @@
STRUCT_TM_GMTOFF_CHECK
SCANF_LLD_CHECK
-if test $am_cv_scanf_lld = "no"; then
+if test x$am_cv_scanf_lld = "xno"; then
SCANF_QD_CHECK
- if test $am_cv_scanf_qs = "no"; then
+ if test x$am_cv_scanf_qs = "xno"; then
AC_MSG_ERROR([cannot continue, no long long conversion support in scanf])
fi
fi
@@ -314,8 +314,8 @@
AS_SCRUB_INCLUDE(CFLAGS)
AC_MSG_CHECKING([for (g-wrap) guile module])
-if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
- GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
${GUILE} -c "(use-modules (g-wrap))" > /dev/null 2>&1
then
AC_MSG_RESULT(yes)
@@ -323,22 +323,54 @@
AC_MSG_ERROR([
Cannot find the (g-wrap) guile module.
- Are you sure you have g-wrap installed?
+ Are you sure you have g-wrap compile-time environment installed?
+ See http://bugzilla.gnome.org/show_bug.cgi?id=347680
])
fi
+AC_MSG_CHECKING([for (g-wrap gw-glib-spec) guile module])
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
+ ${GUILE} -c "(use-modules (g-wrap gw-glib-spec))" > /dev/null 2>&1
+then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_ERROR([
+
+ Cannot find the (g-wrap gw-glib-spec) guile module.
+ Are you sure you have g-wrap installed with glib support?
+ See http://bugzilla.gnome.org/show_bug.cgi?id=347404
+
+])
+fi
+
+AC_MSG_CHECKING([for SLIB support])
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
+ ${GUILE} -c "(use-modules (ice-9 slib)) (require 'printf)" > /dev/null 2>&1
+then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_ERROR([
+
+ Cannot find SLIB. Are you sure you have it installed?
+ See http://bugzilla.gnome.org/show_bug.cgi?id=347922
+
+])
+fi
+
AC_MSG_CHECKING([for (g-wrap gw-standard) guile module])
-if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
- GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
${GUILE} -c "(use-modules (g-wrap gw-standard))" > /dev/null 2>&1
then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING([for (g-wrap gw standard) guile module])
- if LD_LIBRARY_PATH=$G_WRAP_LIB_DIR:$LD_LIBRARY_PATH \
- GUILE_LOAD_PATH=$G_WRAP_MODULE_DIR \
+ if LD_LIBRARY_PATH="${G_WRAP_LIB_DIR}:${LD_LIBRARY_PATH}" \
+ GUILE_LOAD_PATH="${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH}" \
${GUILE} -c "(use-modules (g-wrap gw standard))" > /dev/null 2>&1
then
AC_MSG_RESULT(yes)
@@ -730,7 +762,7 @@
# This is libofx >= 0.7.x
AC_MSG_RESULT([found ${LIBOFX_VERSION}])
else
- if x${want_ofx} = xyes ; then
+ if test x${want_ofx} = xyes ; then
AC_MSG_ERROR([found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support])
else
AC_MSG_RESULT([found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support])
@@ -892,12 +924,12 @@
AC_ARG_ENABLE( etags,
[ --enable-etags enable automatic create of TAGS file],
- if test $enableval = yes; then
+ if test x$enableval = xyes; then
USE_ETAGS=1
fi,
USE_ETAGS=0)
-if test ${USE_ETAGS} = 1; then
+if test x${USE_ETAGS} = x1; then
AC_CHECK_PROG(GNC_ETAGS_FILE, etags, TAGS)
fi
@@ -908,12 +940,12 @@
AC_ARG_ENABLE( ctags,
[ --enable-ctags enable automatic create of tags file],
- if test $enableval = yes; then
+ if test x$enableval = xyes; then
USE_CTAGS=1
fi,
USE_CTAGS=0)
-if test ${USE_CTAGS} = 1; then
+if test x${USE_CTAGS} = x1; then
AC_CHECK_PROG(GNC_CTAGS_FILE, ctags, tags)
fi
@@ -1085,13 +1117,13 @@
# check for gtkhtml 3.x versions.
gtkhtml=0
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1] , [gtkhtml=0])
- if test $gtkhtml = 0
+ if test x$gtkhtml = x0
then
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.6 , [gtkhtml=1] , [gtkhtml=0])
- if test $gtkhtml = 0
+ if test x$gtkhtml = x0
then
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1] , [gtkhtml=0])
- if test $gtkhtml = 0
+ if test x$gtkhtml = x0
then
PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1],
AC_MSG_ERROR([Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, or 3.8)]))
@@ -1115,7 +1147,7 @@
AC_ARG_ENABLE( efence,
[ --enable-efence link using efence],
- if test $enableval = yes; then
+ if test x$enableval = xyes; then
EFENCE_LIBS="-lefence"
USE_EFENCE=1
AC_DEFINE(USE_EFENCE,,We are using EFence)
@@ -1159,6 +1191,18 @@
AM_CONDITIONAL(HAVE_GTK26, test "x$HAVE_GTK26" = "xyes" )
+ AC_MSG_CHECKING(for GTK - version >= 2.10.0)
+ if $PKG_CONFIG 'gtk+-2.0 >= 2.10.0'
+ then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_GTK_2_10,1,[System has gtk 2.10.0 or better])
+ HAVE_GTK_2_10=yes
+ else
+ AC_MSG_RESULT(no)
+ fi
+ AM_CONDITIONAL(HAVE_GTK_2_10, test "x$HAVE_GTK_2_10" = "xyes" )
+
+
AC_MSG_CHECKING(for pango version >= 1.8.0)
if $PKG_CONFIG 'pango >= 1.8.0'
then
@@ -1266,12 +1310,12 @@
PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
- if test $fdopen_works = no ; then
+ if test x$fdopen_works = xno ; then
unset ac_cv_have_decl_fdopen
CFLAGS="$CFLAGS -D_POSIX_SOURCE"
AC_MSG_NOTICE([adding -D_POSIX_SOURCE to CFLAGS])
AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no)
- if test $fdopen_works = no ; then
+ if test x$fdopen_works = xno ; then
AC_MSG_ERROR([fdopen is not available])
fi
fi
@@ -1285,12 +1329,12 @@
[[struct timeval tv;]])],
struct_timeval_works=yes,
struct_timeval_works=no)
- test $struct_timeval_works = yes && break
+ test x$struct_timeval_works = xyes && break
# Try this for the second attempt:
- test $try = 1 && CFLAGS="$CFLAGS -D__EXTENSIONS__"
+ test x$try = x1 && CFLAGS="$CFLAGS -D__EXTENSIONS__"
done
AC_MSG_RESULT($struct_timeval_works)
- if test $struct_timeval_works = no ; then
+ if test x$struct_timeval_works = xno ; then
AC_MSG_ERROR([struct timeval is not available])
fi
@@ -1309,7 +1353,7 @@
[[void *ptr = &lstat]])],
need_bsd2=no, need_bsd2=yes)
AC_MSG_RESULT($need_bsd2)
- if test $need_bsd1 = yes -o $need_bsd2 = yes; then
+ if test x$need_bsd1 = xyes -o x$need_bsd2 = xyes; then
CFLAGS="$CFLAGS -D_BSD_SOURCE"
fi
@@ -1475,18 +1519,18 @@
#dnl esac[]dnl
#dnl])
have_gnome=no
- if test $want_gnome = no ; then
+ if test x$want_gnome = xno ; then
AC_MSG_WARN([GNOME support disabled, as requested (Use --with-gnome to enable)])
else
PKG_CHECK_MODULES(LIBGSF_GNOME, $libgsf_gnome_reqs,
[have_gnome=yes],
- [if test $want_gnome = yes; then
+ [if test x$want_gnome = xyes; then
AC_MSG_ERROR([GNOME support requested, but not available.])
else
AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo])
fi])
fi
- AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
+ AM_CONDITIONAL(WITH_LIBGSF_GNOME, test x$have_gnome = xyes)
dnl # LDFLAGS="-no-undefined $LDFLAGS"
@@ -1658,7 +1702,7 @@
;;
esac
AC_MSG_RESULT($with_win32)
- AM_CONDITIONAL(WITH_WIN32, test $with_win32 = yes)
+ AM_CONDITIONAL(WITH_WIN32, test x$with_win32 = xyes)
dnl *****************************
dnl FIXME: perhaps declare with AC_ARG_VAR?
@@ -1684,12 +1728,12 @@
AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], works_without_bsd_source=yes, works_without_bsd_source=no)
AC_MSG_RESULT($works_without_bsd_source)
- if test $works_without_bsd_source = no ; then
+ if test x$works_without_bsd_source = xno ; then
CFLAGS="$CFLAGS -D_BSD_SOURCE"
AC_MSG_CHECKING([whether M_PI is available with -D_BSD_SOURCE])
AC_TRY_COMPILE([#include <math.h>], [double f = M_PI], m_pi_works=yes, m_pi_works=no)
AC_MSG_RESULT($m_pi_works)
- if test $m_pi_works = no ; then
+ if test x$m_pi_works = xno ; then
AC_MSG_ERROR([M_PI is not available])
fi
fi
@@ -1716,7 +1760,7 @@
dnl
dnl On BSD, we seem to need -lm for finite
dnl
- if test $ac_cv_func_finite = no; then
+ if test x$ac_cv_func_finite = xno; then
AC_CHECK_LIB(m, finite,
[AC_DEFINE(HAVE_FINITE, 1,
[Define if the finite function is available]
@@ -1729,7 +1773,7 @@
dnl Handle systems that have stuff in -lm.
AC_CHECK_FUNCS(log)
- if test $ac_cv_func_log = no; then
+ if test x$ac_cv_func_log = xno; then
AC_CHECK_LIB(m, log,
[AC_DEFINE(HAVE_LOG, 1,
[Define if the log function is available]
@@ -1753,7 +1797,7 @@
float_msg=no
EXTRA_LIBS= EXTRA_INCLUDES=
AC_C_LONG_DOUBLE
- if test $ac_cv_c_long_double = yes; then
+ if test x$ac_cv_c_long_double = xyes; then
have_mandatory_funcs=yes
need_sunmath=0
sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
@@ -1765,7 +1809,7 @@
,
[AC_CHECK_LIB(sunmath,
$ldfunc,
- [ if test $need_sunmath = 0; then
+ [ if test x$need_sunmath = x0; then
# FIXME: better idea?
LDFLAGS="$LDFLAGS $sunmathlinkstuff"
sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'`
@@ -1775,7 +1819,7 @@
[have_mandatory_funcs=no],
[-L/opt/SUNWspro/lib $GOFFICE_DEPS_LIBS])])])
done
- if test $need_sunmath = 1; then
+ if test x$need_sunmath = x1; then
EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff"
EXTRA_INCLUDES="$EXTRA_INCLUDES -I$sunmathinclude"
AC_CHECK_HEADERS([sunmath.h floatingpoint.h],
@@ -1870,6 +1914,7 @@
else
### A bunch of am conditionals that need to be set
AM_CONDITIONAL(HAVE_GTK26, false )
+ AM_CONDITIONAL(HAVE_GTK_2_10, false)
AM_CONDITIONAL(HAVE_PANGO18, false )
AM_CONDITIONAL(HAVE_LIBGSF, false)
AM_CONDITIONAL(HAVE_GOFFICE, false)
@@ -1972,7 +2017,7 @@
AC_REPLACE_FUNCS(strptime localtime_r)
#AC_REPLACE_FUNCS(scm_strptime)
-if test $am_cv_val_LC_MESSAGES = "no"; then
+if test x$am_cv_val_LC_MESSAGES = "xno"; then
LC_MESSAGES_ENUM="LC_ALL"
else
LC_MESSAGES_ENUM="LC_MESSAGES"
@@ -2070,17 +2115,17 @@
# -Wdeclaration-after-statement in order to preserve source code
# compatibility to gcc 2.95 and other compilers.
GCC_VERSION=`${CC} -dumpversion`
- if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 3; then
+ if test "`echo ${GCC_VERSION} | cut -d. -f1`" -ge 3; then
# This is gcc >= 3.x.x
- if test `echo ${GCC_VERSION} | cut -d. -f2` -ge 4; then
+ if test "`echo ${GCC_VERSION} | cut -d. -f2`" -ge 4; then
# This is gcc >= 3.4.x
warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement"
- else if test `echo ${GCC_VERSION} | cut -d. -f1` -ge 4; then
+ else if test "`echo ${GCC_VERSION} | cut -d. -f1`" -ge 4; then
# This is gcc == 4.x.x
warnFLAGS="${warnFLAGS} -Wdeclaration-after-statement -Wno-pointer-sign"
# rpmbuild on FC4 forces this flag. Can't hurt to always compile with it.
warnFLAGS="${warnFLAGS} -D_FORTIFY_SOURCE=2"
- if test $gwrap_major_version = 1 -a $gwrap_minor_version -lt 9 ; then
+ if test x$gwrap_major_version = x1 -a "$gwrap_minor_version" -lt 9 ; then
# This is g-wrap 1.3 + gcc4. Test error-on-warning
case "$gnc_error_on_warning" in
auto)
Modified: gnucash/branches/deprecated-cleanup/doc/tip_of_the_day.list.in
===================================================================
--- gnucash/branches/deprecated-cleanup/doc/tip_of_the_day.list.in 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/doc/tip_of_the_day.list.in 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1,6 +1,6 @@
- N_( "Warning!! This is a DEVELOPMENT version of GnuCash. \
-It probably has lots of bugs and unstable features! \
-If you are looking for a stable personal finance application, \
+ N_( "Warning!! This is a DEVELOPMENT version of GnuCash. \
+It probably has lots of bugs and unstable features! \
+If you are looking for a stable personal finance application, \
you should use the latest release of GnuCash 2.0.")
N_( "The GnuCash online manual has lots of helpful information. \
@@ -30,7 +30,7 @@
N_( "To enter multiple-split transactions such as a paycheck with \
multiple deductions, click the Split button in the tool bar. \
-Alternatively, in the View -> Style menu, you can choose the register \
+Alternatively, in the View menu, you can choose the register \
style Auto-Split Ledger or Transaction Journal.")
N_( "As you enter amounts in the register, you can use the GnuCash \
Modified: gnucash/branches/deprecated-cleanup/lib/goffice-0.0.4/goffice/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/lib/goffice-0.0.4/goffice/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/lib/goffice-0.0.4/goffice/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -24,7 +24,6 @@
CLEANFILES = $(BUILT_SOURCES)
libgoffice_1_la_SOURCES = \
- $(BUILT_SOURCES) \
goffice.c \
goffice-priv.h
if !HAVE_GLIB26
Modified: gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -40,6 +40,4 @@
mv $@.tmp $@
BUILT_SOURCES = qsf-dir.h
-
-CONFIG_CLEAN_FILES = qsf-dir.h
-
+CLEANFILES = qsf-dir.h
Modified: gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/qsf-backend.c
===================================================================
--- gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/qsf-backend.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/lib/libqof/backend/file/qsf-backend.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -117,9 +117,9 @@
g_free(option);
option = g_new0(QofBackendOption, 1);
option->option_name = QSF_ENCODING;
- option->description = _("Encoding string to use when writing the XML file.");
+ option->description = _("String encoding to use when writing the XML file.");
option->tooltip = _("QSF defaults to UTF-8. Other encodings are supported by "
- "passing the encoding string in this option.");
+ "passing the string encoding in this option.");
option->type = KVP_TYPE_STRING;
option->value = (gpointer)params->encoding;
qof_backend_prepare_option(be, option);
Modified: gnucash/branches/deprecated-cleanup/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/lib/libqof/qof/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/lib/libqof/qof/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -94,4 +94,4 @@
mv $@.tmp $@
BUILT_SOURCES = qofla-dir.h
-DISTCLEANFILES = qofla-dir.h
+CLEANFILES = $(BUILT_SOURCES)
Modified: gnucash/branches/deprecated-cleanup/lib/libqof/qof/gnc-numeric.c
===================================================================
--- gnucash/branches/deprecated-cleanup/lib/libqof/qof/gnc-numeric.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/lib/libqof/qof/gnc-numeric.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -785,6 +785,9 @@
}
sigfigs = GNC_HOW_GET_SIGFIGS(how);
+ if (fabs(sigfigs - logratio) > 18)
+ return gnc_numeric_error(GNC_ERROR_OVERFLOW);
+
if(sigfigs-logratio >= 0) {
denom = (gint64)(pow(10, sigfigs-logratio));
}
Modified: gnucash/branches/deprecated-cleanup/po/POTFILES.skip
===================================================================
--- gnucash/branches/deprecated-cleanup/po/POTFILES.skip 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/po/POTFILES.skip 2006-07-30 04:57:40 UTC (rev 14581)
@@ -6,7 +6,6 @@
src/backend/dwi/qofmap.c
src/gnome-utils/gnc-tree-model-selection.c
src/backend/file/gncmod-backend-file.c
-src/gnome/schemas/apps_gnucash_dialog_scheduled_transctions.schemas.in
src/backend/file/io-gncbin-r.c
src/import-export/binary-import/binary-import.glade
src/import-export/binary-import/druid-commodity.c
Modified: gnucash/branches/deprecated-cleanup/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/app-utils/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/app-utils/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -64,9 +64,6 @@
guile-util.h \
option-util.h
-noinst_HEADERS = \
- gw-app-utils.h
-
libgncmod_app_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
@@ -90,7 +87,7 @@
${QOF_LIBS} \
${GLIB_LIBS}
-libgw_app_utils_la_SOURCES = gw-app-utils.c
+nodist_libgw_app_utils_la_SOURCES = gw-app-utils.c
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = app-utils.scm
@@ -107,7 +104,8 @@
simple-obj.scm
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-app-utils.scm gw-app-utils-spec.scm
+gwmod_DATA = gw-app-utils-spec.scm
+nodist_gwmod_DATA = gw-app-utils.scm
noinst_DATA = .scm-links
@@ -146,5 +144,5 @@
(gw:generate-wrapset \"gw-app-utils\")"
BUILT_SOURCES = gw-app-utils.scm gw-app-utils.c gw-app-utils.h
-DISTCLEANFILES = ${SCM_FILE_LINKS} gnucash g-wrapped .scm-links \
- gw-app-utils.html
+CLEANFILES = $(BUILT_SOURCES) ${SCM_FILE_LINKS} gnucash g-wrapped \
+ .scm-links gw-app-utils.html
Modified: gnucash/branches/deprecated-cleanup/src/bin/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/bin/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/bin/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -67,7 +67,7 @@
mv $@.tmp $@
chmod u+x $@
-CLEANFILES = gnucash gnucash-valgrind
+CLEANFILES = $(BUILT_SOURCES) gnucash gnucash-valgrind
# We handle gnucash scripts in a somewhat unexpected way, but we do
# this so that a user who doesn't necessarily have the right
@@ -99,7 +99,6 @@
${srcdir}/generate-gnc-script $@ "${gncoverridesdir}"
CLEANFILES += ${gnc_common_scripts} update-gnucash-gconf
-DISTCLEANFILES = i18n.h
## We borrow guile's convention and use @-...-@ as the substitution
## brackets here, instead of the usual @... at . This prevents autoconf
Modified: gnucash/branches/deprecated-cleanup/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-core/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-core/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -52,8 +52,7 @@
gncTaxTable.h \
gncTaxTableP.h \
gncVendor.h \
- gncVendorP.h \
- gw-business-core.h
+ gncVendorP.h
libgncmod_business_core_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
@@ -67,7 +66,9 @@
# business-core-helpers.c
libgw_business_core_la_SOURCES = \
- gncBusGuile.c \
+ gncBusGuile.c
+
+nodist_libgw_business_core_la_SOURCES = \
gw-business-core.c
libgw_business_core_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
@@ -83,8 +84,9 @@
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = \
- gw-business-core.scm \
gw-business-core-spec.scm
+nodist_gwmod_DATA = \
+ gw-business-core.scm
EXTRA_DIST = \
${gncmod_DATA} \
@@ -118,5 +120,5 @@
(gw:generate-wrapset \"gw-business-core\")"
BUILT_SOURCES = gw-business-core.scm gw-business-core.c gw-business-core.h
-DISTCLEANFILES = g-wrapped gnucash .scm-links ${SCM_FILE_LINKS} \
- gw-business-core.html
+CLEANFILES = $(BUILT_SOURCES) gw-business-core.html \
+ g-wrapped gnucash .scm-links ${SCM_FILE_LINKS}
Modified: gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -50,6 +50,8 @@
char * email;
};
+static QofLogModule log_module = GNC_MOD_BUSINESS;
+
#define _GNC_MOD_NAME GNC_ADDRESS_MODULE_NAME
G_INLINE_FUNC void mark_address (GncAddress *address);
@@ -137,7 +139,17 @@
gncAddressDestroy (GncAddress *addr)
{
if (!addr) return;
+ addr->inst.do_free = TRUE;
+ gncAddressCommitEdit (addr);
+}
+static void
+gncAddressFree (GncAddress *addr)
+{
+ if (!addr) return;
+
+ qof_event_gen (&addr->inst.entity, QOF_EVENT_DESTROY, NULL);
+
CACHE_REMOVE (addr->name);
CACHE_REMOVE (addr->addr1);
CACHE_REMOVE (addr->addr2);
@@ -147,16 +159,19 @@
CACHE_REMOVE (addr->fax);
CACHE_REMOVE (addr->email);
+ qof_instance_release (&addr->inst);
g_free (addr);
}
+
/* Set functions */
-#define SET_STR(member, str) { \
+#define SET_STR(obj, member, str) { \
char * tmp; \
\
if (member == str) return; \
if (!safe_strcmp (member, str)) return; \
+ gncAddressBeginEdit (obj); \
tmp = CACHE_INSERT (str); \
CACHE_REMOVE (member); \
member = tmp; \
@@ -166,66 +181,100 @@
{
if (!addr) return;
if (!name) return;
- SET_STR(addr->name, name);
+ SET_STR(addr, addr->name, name);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetAddr1 (GncAddress *addr, const char *addr1)
{
if (!addr) return;
if (!addr1) return;
- SET_STR(addr->addr1, addr1);
+ SET_STR(addr, addr->addr1, addr1);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetAddr2 (GncAddress *addr, const char *addr2)
{
if (!addr) return;
if (!addr2) return;
- SET_STR(addr->addr2, addr2);
+ SET_STR(addr, addr->addr2, addr2);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetAddr3 (GncAddress *addr, const char *addr3)
{
if (!addr) return;
if (!addr3) return;
- SET_STR(addr->addr3, addr3);
+ SET_STR(addr, addr->addr3, addr3);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetAddr4 (GncAddress *addr, const char *addr4)
{
if (!addr) return;
if (!addr4) return;
- SET_STR(addr->addr4, addr4);
+ SET_STR(addr, addr->addr4, addr4);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetPhone (GncAddress *addr, const char *phone)
{
if (!addr) return;
if (!phone) return;
- SET_STR(addr->phone, phone);
+ SET_STR(addr, addr->phone, phone);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetFax (GncAddress *addr, const char *fax)
{
if (!addr) return;
if (!fax) return;
- SET_STR(addr->fax, fax);
+ SET_STR(addr, addr->fax, fax);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
void gncAddressSetEmail (GncAddress *addr, const char *email)
{
if (!addr) return;
if (!email) return;
- SET_STR(addr->email, email);
+ SET_STR(addr, addr->email, email);
mark_address (addr);
+ gncAddressCommitEdit (addr);
}
+void gncAddressBeginEdit (GncAddress *addr)
+{
+ qof_begin_edit (&addr->inst);
+}
+
+static inline void gncAddressOnError (QofInstance *inst, QofBackendError errcode)
+{
+ PERR("Address QofBackend Failure: %d", errcode);
+}
+
+static inline void gncAddressOnDone (QofInstance *addr) { }
+
+static inline void address_free (QofInstance *inst)
+{
+ GncAddress *addr = (GncAddress *) inst;
+ gncAddressFree (addr);
+}
+
+void gncAddressCommitEdit (GncAddress *addr)
+{
+ if (!qof_commit_edit (QOF_INSTANCE(addr))) return;
+ qof_commit_edit_part2 (&addr->inst, gncAddressOnError,
+ gncAddressOnDone, address_free);
+}
+
+
/* Get Functions */
const char * gncAddressGetName (const GncAddress *addr)
Modified: gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.h
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.h 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-core/gncAddress.h 2006-07-30 04:57:40 UTC (rev 14581)
@@ -80,11 +80,10 @@
/** @name Create/Destroy functions
@{ */
-/** create a new address */
-GncAddress * gncAddressCreate (QofBook *book, QofEntity *parent);
-
-/** destroy an address */
+GncAddress *gncAddressCreate (QofBook *book, QofEntity *parent);
void gncAddressDestroy (GncAddress *addr);
+void gncAddressBeginEdit (GncAddress *addr);
+void gncAddressCommitEdit (GncAddress *addr);
/** @} */
Modified: gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -839,13 +839,15 @@
* the amount the merchant gets; the taxes are the amount the gov't
* gets, and the customer pays the sum or value + taxes.
*
+ * The SCU is the denominator to convert the value.
+ *
* The discount return value is just for entertainment -- you may way
* to let a consumer know how much they saved.
*/
void gncEntryComputeValue (gnc_numeric qty, gnc_numeric price,
GncTaxTable *tax_table, gboolean tax_included,
gnc_numeric discount, GncAmountType discount_type,
- GncDiscountHow discount_how,
+ GncDiscountHow discount_how, int SCU,
gnc_numeric *value, gnc_numeric *discount_value,
GList **tax_value)
{
@@ -975,11 +977,15 @@
* need to compute taxes (based on 'pretax') if the caller wants it.
*/
- if (discount_value != NULL)
+ if (discount_value != NULL) {
+ if (SCU) discount = gnc_numeric_convert(discount, SCU, GNC_RND_ROUND);
*discount_value = discount;
+ }
- if (value != NULL)
+ if (value != NULL) {
+ if (SCU) result = gnc_numeric_convert(result, SCU, GNC_RND_ROUND);
*value = result;
+ }
/* Now... Compute the list of tax values (if the caller wants it) */
@@ -995,12 +1001,14 @@
switch (gncTaxTableEntryGetType (entry)) {
case GNC_AMT_TYPE_VALUE:
+ if (SCU) amount = gnc_numeric_convert(amount, SCU, GNC_RND_ROUND);
taxes = gncAccountValueAdd (taxes, acc, amount);
break;
case GNC_AMT_TYPE_PERCENT:
amount = gnc_numeric_div (amount, percent, GNC_DENOM_AUTO,
GNC_DENOM_LCD);
tax = gnc_numeric_mul (pretax, amount, GNC_DENOM_AUTO, GNC_DENOM_LCD);
+ if (SCU) tax = gnc_numeric_convert(tax, SCU, GNC_RND_ROUND);
taxes = gncAccountValueAdd (taxes, acc, tax);
break;
default:
@@ -1066,12 +1074,16 @@
entry->b_tax_values = NULL;
}
+ /* Determine the commodity denominator */
+ denom = get_entry_commodity_denom (entry);
+
/* Compute the invoice values */
gncEntryComputeValue (entry->quantity, entry->i_price,
(entry->i_taxable ? entry->i_tax_table : NULL),
entry->i_taxincluded,
entry->i_discount, entry->i_disc_type,
entry->i_disc_how,
+ denom,
&(entry->i_value), &(entry->i_disc_value),
&(entry->i_tax_values));
@@ -1080,9 +1092,9 @@
(entry->b_taxable ? entry->b_tax_table : NULL),
entry->b_taxincluded,
gnc_numeric_zero(), GNC_AMT_TYPE_VALUE, GNC_DISC_PRETAX,
+ denom,
&(entry->b_value), NULL, &(entry->b_tax_values));
- denom = get_entry_commodity_denom (entry);
entry->i_value_rounded = gnc_numeric_convert (entry->i_value, denom,
GNC_RND_ROUND);
entry->i_disc_value_rounded = gnc_numeric_convert (entry->i_disc_value, denom,
Modified: gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.h
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.h 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-core/gncEntry.h 2006-07-30 04:57:40 UTC (rev 14581)
@@ -174,7 +174,9 @@
/** Compute the Entry value, tax-value, and discount_value, based on
* the quantity, price, discount, tax-table, and types. The value is
* the amount the merchant gets, the taxes are what the gov't gets,
- * and the discount is how much the customer saved.
+ * and the discount is how much the customer saved. The SCU is the
+ * target denominator of the value and tax -- it should be the
+ * account or commodity SCU of the target.
*
* The tax_values list is the property of the entry and will be
* destroyed automatically, so use it quickly. Note that all return
@@ -187,7 +189,7 @@
void gncEntryComputeValue (gnc_numeric qty, gnc_numeric price,
GncTaxTable *tax_table, gboolean tax_included,
gnc_numeric discount, GncAmountType discount_type,
- GncDiscountHow discount_how,
+ GncDiscountHow discount_how, int SCU,
/* return values */
gnc_numeric *value, gnc_numeric *discount_value,
GList **tax_values);
Modified: gnucash/branches/deprecated-cleanup/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-gnome/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-gnome/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -64,8 +64,7 @@
dialog-vendor.h \
gnc-plugin-business.h \
gnc-plugin-page-invoice.h \
- search-owner.h \
- gw-business-gnome.h
+ search-owner.h
libgncmod_business_gnome_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
@@ -89,7 +88,7 @@
${EFENCE_LIBS}
-libgw_business_gnome_la_SOURCES = gw-business-gnome.c
+nodist_libgw_business_gnome_la_SOURCES = gw-business-gnome.c
libgw_business_gnome_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
libgw_business_gnome_la_LIBADD = \
@@ -106,8 +105,9 @@
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = \
- gw-business-gnome.scm \
gw-business-gnome-spec.scm
+nodist_gwmod_DATA = \
+ gw-business-gnome.scm
EXTRA_DIST = \
${gncmod_DATA} \
@@ -147,5 +147,5 @@
(gw:generate-wrapset \"gw-business-gnome\")"
BUILT_SOURCES = gw-business-gnome.scm gw-business-gnome.c gw-business-gnome.h
-CLEANFILES = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-business-gnome.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+ ${SCM_FILE_LINKS} gw-business-gnome.html
Modified: gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-invoice.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-invoice.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-invoice.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1678,6 +1678,9 @@
new_page = gnc_plugin_page_invoice_new (iw);
gnc_main_window_open_page (gnc_plugin_business_get_window(), new_page);
+ /* Initialize the summary bar */
+ gnc_invoice_redraw_all_cb(iw->reg, iw);
+
return iw;
}
Modified: gnucash/branches/deprecated-cleanup/src/business/business-ledger/gncEntryLedger.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-ledger/gncEntryLedger.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/business-ledger/gncEntryLedger.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -627,6 +627,7 @@
gboolean taxable, taxincluded;
GncTaxTable *table;
GList *taxes = NULL;
+ int denom = 100;
gnc_entry_ledger_get_numeric (ledger, ENTRY_QTY_CELL, &qty);
gnc_entry_ledger_get_numeric (ledger, ENTRY_PRIC_CELL, &price);
@@ -670,18 +671,20 @@
table = NULL;
}
+ if (ledger->invoice)
+ {
+ gnc_commodity *currency = gncInvoiceGetCurrency(ledger->invoice);
+ if (currency)
+ denom = gnc_commodity_get_fraction(currency);
+ }
+
gncEntryComputeValue (qty, price, (taxable ? table : NULL), taxincluded,
- discount, disc_type, disc_how,
+ discount, disc_type, disc_how, denom,
value, NULL, &taxes);
- /* Now convert the values to the proper denomination */
- if (value)
- *value = gnc_numeric_convert (*value, 100 /* XXX */, GNC_RND_ROUND);
-
- if (tax_value) {
+ /* return the tax value */
+ if (tax_value)
*tax_value = gncAccountValueTotal (taxes);
- *tax_value = gnc_numeric_convert (*tax_value, 100 /* XXX */, GNC_RND_ROUND);
- }
}
gboolean
Modified: gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -25,8 +25,7 @@
dialog-tax-table.c
noinst_HEADERS = \
- dialog-tax-table.h \
- gw-dialog-tax-table.h
+ dialog-tax-table.h
libgncmod_dialog_tax_table_la_LIBADD = \
${top_builddir}/src/business/business-core/libgncmod-business-core.la \
@@ -42,7 +41,7 @@
${QOF_LIBS} \
${EFENCE_LIBS}
-libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
+nodist_libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
libgw_dialog_tax_table_la_LIBADD = \
libgncmod-dialog-tax-table.la \
@@ -50,8 +49,9 @@
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = \
- gw-dialog-tax-table.scm \
gw-dialog-tax-table-spec.scm
+nodist_gwmod_DATA = \
+ gw-dialog-tax-table.scm
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = dialog-tax-table.scm
@@ -97,5 +97,5 @@
BUILT_SOURCES = gw-dialog-tax-table.scm gw-dialog-tax-table.c \
gw-dialog-tax-table.h
-CLEANFILES = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-dialog-tax-table.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+ ${SCM_FILE_LINKS} gw-dialog-tax-table.html
Modified: gnucash/branches/deprecated-cleanup/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/core-utils/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/core-utils/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -14,7 +14,7 @@
${GCONF_LIBS} \
${GTK_LIBS}
-libgw_core_utils_la_SOURCES = \
+nodist_libgw_core_utils_la_SOURCES = \
gw-core-utils.c
libgw_core_utils_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
@@ -30,8 +30,7 @@
gnc-gkeyfile-utils.h \
gnc-glib-utils.h \
gnc-gobject-utils.h \
- gnc-gtk-utils.h \
- gw-core-utils.h
+ gnc-gtk-utils.h
EXTRA_DIST = ${gwmod_DATA}
@@ -43,7 +42,8 @@
${GTK_CFLAGS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-core-utils-spec.scm gw-core-utils.scm
+gwmod_DATA = gw-core-utils-spec.scm
+nodist_gwmod_DATA = gw-core-utils.scm
if GNUCASH_SEPARATE_BUILDDIR
#Only needed when srcdir and builddir are different
@@ -69,5 +69,5 @@
(gw:generate-wrapset \"gw-core-utils\")"
BUILT_SOURCES = gw-core-utils.scm gw-core-utils.h gw-core-utils.c
-CLEANFILES = g-wrapped gnucash .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-core-utils.html
+CLEANFILES = $(BUILT_SOURCES) g-wrapped gnucash .scm-links \
+ ${SCM_FILE_LINKS} gw-core-utils.html
Modified: gnucash/branches/deprecated-cleanup/src/core-utils/gnc-glib-utils.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/core-utils/gnc-glib-utils.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/core-utils/gnc-glib-utils.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -110,7 +110,7 @@
((Char) < 0x110000 && \
(((Char) & 0xFFFFF800) != 0xD800) && \
((Char) < 0xFDD0 || (Char) > 0xFDEF) && \
- ((Char) > 0x20 || (Char) == 0x09 || (Char) == 0x0A || (Char) == 0x0D) && \
+ ((Char) >= 0x20 || (Char) == 0x09 || (Char) == 0x0A || (Char) == 0x0D) && \
((Char) & 0xFFFE) != 0xFFFE)
/**
Modified: gnucash/branches/deprecated-cleanup/src/engine/Group.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/Group.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/Group.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -556,35 +556,79 @@
xaccGetAccountFromFullNameHelper (const AccountGroup *grp,
gchar **names)
{
- Account *found;
+ Account *found = NULL;
GList *node;
+ gchar *name_str, *temp_str;
+ const gchar *separator;
+ gboolean str_alloced = FALSE;
g_return_val_if_fail(grp, NULL);
g_return_val_if_fail(names, NULL);
- /* Look for the first name in the children. */
- for (node = grp->accounts; node; node = node->next) {
- Account *account = node->data;
+ separator = gnc_get_account_separator_string();
+ /* start with the first name in the list */
+ name_str = names[0];
- if (safe_strcmp(xaccAccountGetName (account), names[0]) == 0) {
- /* We found an account. If the next entry is NULL, there is
- * nothing left in the name, so just return the account. */
- if (names[1] == NULL)
- return account;
+ /* Make sure we actually HAVE a string! */
+ if (name_str == NULL)
+ return NULL;
- /* No children? We're done. */
- if (!account->children)
- return NULL;
+ while (1)
+ {
+ /* Look for the first name in the children. */
+ for (node = grp->accounts; node; node = node->next) {
+ Account *account = node->data;
- /* There's stuff left to search for. Search recursively. */
- found = xaccGetAccountFromFullNameHelper(account->children, &names[1]);
- if (found != NULL) {
- return found;
+ if (safe_strcmp(xaccAccountGetName (account), name_str) == 0) {
+ /* We found an account. If the next entry is NULL, there is
+ * nothing left in the name, so just return the account. */
+ if (names[1] == NULL) {
+ found = account;
+ goto done;
+ }
+
+ /* No children? We're done. */
+ if (!account->children) {
+ found = NULL;
+ goto done;
+ }
+
+ /* There's stuff left to search for. Search recursively. */
+ found = xaccGetAccountFromFullNameHelper(account->children, &names[1]);
+ if (found != NULL) {
+ goto done;
+ }
}
}
+
+ /* If we got here then we didn't find a match based on name_str
+ * so build a new name_str using the next token and try again.
+ */
+
+ /* If there's no more names then we're done. We didn't find anything */
+ if (names[1] == NULL) {
+ found = NULL;
+ break;
+ }
+
+ /* If we are here, we didn't find anything and there
+ * must be more separators. So, continue looking with
+ * a longer name, in case there is a name with the
+ * separator character in it. */
+
+ /* Build the new name string */
+ temp_str = g_strconcat(name_str, separator, names[1], NULL);
+ if (str_alloced)
+ g_free(name_str);
+ str_alloced = TRUE;
+ names++;
+ name_str = temp_str;
}
- return NULL;
+done:
+ if (str_alloced)
+ g_free(name_str);
+ return found;
}
Modified: gnucash/branches/deprecated-cleanup/src/engine/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -100,8 +100,6 @@
gnc-lot.h \
gnc-lot-p.h \
gnc-pricedb-p.h \
- gw-engine.h \
- gw-kvp.h \
policy-p.h
noinst_SCRIPTS = iso-currencies-to-c
@@ -114,7 +112,8 @@
${GNUCASH_ENGINE_BASE_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
-libgw_kvp_la_SOURCES = gw-kvp.c kvp-scm.c
+libgw_kvp_la_SOURCES = kvp-scm.c
+nodist_libgw_kvp_la_SOURCES = gw-kvp.c
libgw_kvp_la_LDFLAGS = \
${G_WRAP_LINK_ARGS} \
${QOF_LIBS} \
@@ -123,7 +122,8 @@
libgncmod-engine.la \
libgw-engine.la
-libgw_engine_la_SOURCES = gw-engine.c engine-helpers.c glib-helpers.c
+libgw_engine_la_SOURCES = engine-helpers.c glib-helpers.c
+nodist_libgw_engine_la_SOURCES = gw-engine.c
libgw_engine_la_LDFLAGS = \
${G_WRAP_LINK_ARGS} \
${QOF_LIBS} \
@@ -144,8 +144,9 @@
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = \
gw-engine-spec.scm \
+ gw-kvp-spec.scm
+nodist_gwmod_DATA = \
gw-engine.scm \
- gw-kvp-spec.scm \
gw-kvp.scm
EXTRA_DIST = \
@@ -201,16 +202,15 @@
(primitive-load \"./gw-kvp-spec.scm\") \
(gw:generate-wrapset \"gw-kvp\")"
-BUILT_SOURCES = \
- iso-4217-currencies.c \
- gw-engine.scm gw-engine.c gw-engine.h \
- gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
-
-CLEANFILES = gnucash g-wrapped .scm-links gncla-dir.h
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-engine.html gw-kvp.html
-
gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status
rm -f $@.tmp
sed < $< > $@.tmp \
-e 's:@-libdir-@:${libdir}:g'
mv $@.tmp $@
+
+BUILT_SOURCES = iso-4217-currencies.c \
+ gw-engine.scm gw-engine.c gw-engine.h \
+ gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
+
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links gncla-dir.h \
+ ${SCM_FILE_LINKS} gw-engine.html gw-kvp.html
Modified: gnucash/branches/deprecated-cleanup/src/engine/gnc-engine.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/gnc-engine.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/gnc-engine.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -86,11 +86,15 @@
{ NULL, NULL, FALSE } }, *lib;
gnc_engine_init_hook_t hook;
GList * cur;
+ gchar *tracefilename;
if (1 == engine_is_initialized) return;
/* initialize logging to our file. */
- qof_log_init_filename("/tmp/gnucash.trace");
+ tracefilename = g_build_filename(g_get_tmp_dir(), "gnucash.trace",
+ (gchar *)NULL);
+ qof_log_init_filename(tracefilename);
+ g_free(tracefilename);
/* Only set the core log_modules here the rest can be set locally. */
qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_WARNING);
qof_log_set_level(GNC_MOD_IO, QOF_LOG_WARNING);
Modified: gnucash/branches/deprecated-cleanup/src/engine/gnc-filepath-utils.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/gnc-filepath-utils.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/gnc-filepath-utils.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -65,15 +65,15 @@
{
int rc;
struct stat statbuf;
- char *home;
+ const gchar *home;
char *path;
char *data;
/* Punt. Can't figure out where home is. */
- home = getenv ("HOME");
+ home = g_get_home_dir();
if (!home) return;
- path = g_strconcat(home, "/.gnucash", NULL);
+ path = g_build_filename(home, ".gnucash", (gchar *)NULL);
rc = stat (path, &statbuf);
if (rc)
@@ -85,7 +85,7 @@
g_mkdir (path, S_IRWXU); /* perms = S_IRWXU = 0700 */
}
- data = g_strconcat (path, "/data", NULL);
+ data = g_build_filename (path, "data", (gchar *)NULL);
rc = stat (data, &statbuf);
if (rc)
g_mkdir (data, S_IRWXU);
@@ -97,28 +97,24 @@
/* ====================================================================== */
/* XXX hack alert -- we should be yanking this out of some config file */
+/* These are obviously meant to be hard-coded paths to the gnucash
+ data file. That is insane. These should be thrown out
+ altogether. On non-Unix systems (Windows) these paths would not
+ only have different directory separator characters but these
+ would certainly be completely different paths. I'd vote to
+ throw this out completely. -- cstim, 2006-07-19 */
static char * searchpaths[] =
{
- "/usr/share/gnucash/data/",
- "/usr/local/share/gnucash/data/",
- "/usr/share/gnucash/accounts/",
- "/usr/local/share/gnucash/accounts/",
+ "/usr/share/gnucash/data",
+ "/usr/local/share/gnucash/data",
+ "/usr/share/gnucash/accounts",
+ "/usr/local/share/gnucash/accounts",
NULL,
};
typedef gboolean (*pathGenerator)(char *pathbuf, int which);
static gboolean
-xaccAddEndPath(char *pathbuf, const char *ending, int len)
-{
- if(len + strlen(pathbuf) >= PATH_MAX)
- return FALSE;
-
- strcat (pathbuf, ending);
- return TRUE;
-}
-
-static gboolean
xaccCwdPathGenerator(char *pathbuf, int which)
{
if(which != 0)
@@ -131,7 +127,6 @@
if (getcwd (pathbuf, PATH_MAX) == NULL)
return FALSE;
- strcat (pathbuf, "/");
return TRUE;
}
}
@@ -139,23 +134,28 @@
static gboolean
xaccDataPathGenerator(char *pathbuf, int which)
{
- char *path;
-
if(which != 0)
{
return FALSE;
}
else
{
- path = getenv ("HOME");
- if (!path)
+ const gchar *home;
+ gchar *tmppath;
+
+ home = g_get_home_dir ();
+ if (!home)
return FALSE;
- if (PATH_MAX <= (strlen (path) + 20))
- return FALSE;
+ tmppath = g_build_filename (home, ".gnucash", "data", (gchar *)NULL);
+ if (strlen(tmppath) >= PATH_MAX)
+ {
+ g_free (tmppath);
+ return FALSE;
+ }
- strcpy (pathbuf, path);
- strcat (pathbuf, "/.gnucash/data/");
+ g_strlcpy (pathbuf, tmppath, PATH_MAX);
+ g_free (tmppath);
return TRUE;
}
}
@@ -176,7 +176,7 @@
if (PATH_MAX <= strlen(path))
return FALSE;
- strcpy (pathbuf, path);
+ g_strlcpy (pathbuf, path, PATH_MAX);
return TRUE;
}
}
@@ -206,14 +206,12 @@
/* OK, now we try to find or build an absolute file path */
/* check for an absolute file path */
- if (*filefrag == '/')
+ if (g_path_is_absolute(filefrag))
return g_strdup (filefrag);
if (!g_ascii_strncasecmp(filefrag, "file:", 5))
{
- char *ret = g_new(char, strlen(filefrag) - 5 + 1);
- strcpy(ret, filefrag + 5);
- return ret;
+ return g_strdup(filefrag + 5);
}
/* get conservative on the length so that sprintf(getpid()) works ... */
@@ -230,14 +228,14 @@
int j;
for(j = 0; gens[i](pathbuf, j) ; j++)
{
- if(xaccAddEndPath(pathbuf, filefrag, namelen))
- {
- int rc = stat (pathbuf, &statbuf);
- if ((!rc) && (S_ISREG(statbuf.st_mode)))
- {
- return (g_strdup (pathbuf));
- }
+ gchar *fullpath = g_build_filename(pathbuf, filefrag, (gchar *)NULL);
+
+ int rc = stat (fullpath, &statbuf);
+ if ((!rc) && (S_ISREG(statbuf.st_mode)))
+ {
+ return fullpath;
}
+ g_free (fullpath);
}
}
/* OK, we didn't find the file. */
@@ -262,22 +260,20 @@
/* Lets try creating a new file in $HOME/.gnucash/data */
if (xaccDataPathGenerator(pathbuf, 0))
{
- if(xaccAddEndPath(pathbuf, filefrag_dup, namelen))
- {
- g_free (filefrag_dup);
- return (g_strdup (pathbuf));
- }
+ gchar *result;
+ result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
+ g_free (filefrag_dup);
+ return result;
}
/* OK, we still didn't find the file */
/* Lets try creating a new file in the cwd */
if (xaccCwdPathGenerator(pathbuf, 0))
{
- if(xaccAddEndPath(pathbuf, filefrag_dup, namelen))
- {
- g_free (filefrag_dup);
- return (g_strdup (pathbuf));
- }
+ gchar *result;
+ result = g_build_filename(pathbuf, filefrag_dup, (gchar *)NULL);
+ g_free (filefrag_dup);
+ return result;
}
g_free (filefrag_dup);
Modified: gnucash/branches/deprecated-cleanup/src/engine/test/test-resolve-file-path.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/test/test-resolve-file-path.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/test/test-resolve-file-path.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -39,10 +39,14 @@
typedef struct test_strings_struct test_strings;
test_strings strs[] = {
- { "/.gnucash/test-account-name", "/.gnucash/test-account-name", 1 },
- { "/tmp/test-account-name2", "/tmp/test-account-name2", 0 },
- { "postgres://localhost/foo/bar", "/.gnucash/data/postgres:,,localhost,foo,bar", 2 },
- { "file:/tmp/test-account-name3", "/tmp/test-account-name3", 0 },
+ { G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "test-account-name",
+ G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "test-account-name", 1 },
+ { G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2",
+ G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name2", 0 },
+ { "postgres://localhost/foo/bar",
+ G_DIR_SEPARATOR_S ".gnucash" G_DIR_SEPARATOR_S "data" G_DIR_SEPARATOR_S "postgres:,,localhost,foo,bar", 2 },
+ { "file:" G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3",
+ G_DIR_SEPARATOR_S "tmp" G_DIR_SEPARATOR_S "test-account-name3", 0 },
{ NULL, NULL, 0 },
};
@@ -59,15 +63,16 @@
if(strs[i].prefix_home == 1)
{
- dain = g_strdup_printf("%s/%s", g_get_home_dir(), strs[i].input);
- wantout = g_strdup_printf("%s/%s", g_get_home_dir(),
- strs[i].output);
+ dain = g_build_filename(g_get_home_dir(), strs[i].input,
+ (gchar *)NULL);
+ wantout = g_build_filename(g_get_home_dir(), strs[i].output,
+ (gchar *)NULL);
}
else if(strs[i].prefix_home == 2)
{
dain = g_strdup(strs[i].input);
- wantout = g_strdup_printf("%s%s", g_get_home_dir(),
- strs[i].output);
+ wantout = g_build_filename(g_get_home_dir(), strs[i].output,
+ (gchar *)NULL);
}
else
{
Modified: gnucash/branches/deprecated-cleanup/src/engine/test-core/test-engine-stuff.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/engine/test-core/test-engine-stuff.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/engine/test-core/test-engine-stuff.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1334,8 +1334,14 @@
} while (gnc_numeric_check(amt) != GNC_ERROR_OK);
}
xaccSplitSetAmount(ret, amt);
+
+ /* Make sure val and amt have the same sign. Note that amt is
+ also allowed to be zero, because that is caused by a small
+ rate. */
if (gnc_numeric_positive_p(val))
- g_assert(gnc_numeric_positive_p(amt));
+ g_assert(!gnc_numeric_negative_p(amt)); /* non-negative amt */
+ else
+ g_assert(!gnc_numeric_positive_p(amt)); /* non-positive amt */
xaccSplitSetSlots_nc(ret, get_random_kvp_frame());
xaccTransCommitEdit(trn);
Modified: gnucash/branches/deprecated-cleanup/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnc-module/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnc-module/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -18,7 +18,7 @@
${GLIB_LIBS} \
-lltdl
-libgw_gnc_module_la_SOURCES = gw-gnc-module.c
+nodist_libgw_gnc_module_la_SOURCES = gw-gnc-module.c
libgw_gnc_module_la_LIBADD = libgncmodule.la \
${G_WRAP_LINK_ARGS} \
@@ -29,7 +29,8 @@
gncmod_DATA = gnc-module.scm
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnc-module.scm gw-gnc-module-spec.scm
+gwmod_DATA = gw-gnc-module-spec.scm
+nodist_gwmod_DATA = gw-gnc-module.scm
gncincludedir = ${GNC_INCLUDE_DIR}
gncinclude_HEADERS = \
@@ -38,9 +39,6 @@
noinst_DATA = .scm-links
-noinst_HEADERS = \
- gw-gnc-module.h
-
EXTRA_DIST = \
${gncmod_DATA} \
${gwmod_DATA}
@@ -71,5 +69,5 @@
(gw:generate-wrapset \"gw-gnc-module\")"
BUILT_SOURCES = gw-gnc-module.scm gw-gnc-module.h gw-gnc-module.c
-CLEANFILES = .scm-links g-wrapped gnucash
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc-module.html
+CLEANFILES = $(BUILT_SOURCES) .scm-links g-wrapped gnucash \
+ ${SCM_FILE_LINKS} gw-gnc-module.html
Modified: gnucash/branches/deprecated-cleanup/src/gnc-module/gnc-module.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnc-module/gnc-module.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnc-module/gnc-module.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -67,6 +67,13 @@
{
switch(*cpos)
{
+#ifndef G_OS_WIN32
+ /* On windows, with '\' as the directory separator character,
+ this additional de-quoting will make every path processing
+ fail miserably. Anyway this should probably be thrown out
+ altogether, because this additional level of de-quoting
+ (after shell quoting) is completely unexpected and
+ uncommon. */
case '\\':
if(!escchar)
{
@@ -78,6 +85,7 @@
escchar = FALSE;
}
break;
+#endif
case ':':
if(!escchar)
@@ -220,8 +228,9 @@
{
/* get the full path name, then dlopen the library and see
* if it has the appropriate symbols to be a gnc_module */
- fullpath = g_strdup_printf("%s/%s", (char *)(current->data),
+ fullpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", (char *)(current->data),
dent->d_name);
+ /* G_DIR_SEPARATOR_S is "/" on unix and "\\" on windows. */
info = gnc_module_get_info(fullpath);
if(info)
Modified: gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-bar/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-bar/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -12,10 +12,10 @@
libbar_la_SOURCES = bar.c
noinst_HEADERS = \
- bar.h \
- bar-gwrap.h
+ bar.h
-libgncmodbar_la_SOURCES=bar-gwrap.c gnc-mod-bar.c
+libgncmodbar_la_SOURCES=gnc-mod-bar.c
+nodist_libgncmodbar_la_SOURCES=bar-gwrap.c
libgncmodbar_la_LIBADD=libbar.la \
$(G_WRAP_LINK_ARGS) \
@@ -32,9 +32,8 @@
(gw:generate-wrapset \"bar-gwrap\")"
BUILT_SOURCES = bar-gwrap.c bar-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) bar-gwrap.html
-DISTCLEANFILES = bar-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-baz/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-baz/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -14,10 +14,10 @@
libbaz_la_LIBADD = ../mod-foo/libfoo.la
noinst_HEADERS = \
- baz.h \
- baz-gwrap.h
+ baz.h
-libgncmodbaz_la_SOURCES = baz-gwrap.c gnc-mod-baz.c
+libgncmodbaz_la_SOURCES = gnc-mod-baz.c
+nodist_libgncmodbaz_la_SOURCES = baz-gwrap.c
libgncmodbaz_la_LIBADD = \
libbaz.la \
@@ -36,9 +36,8 @@
(gw:generate-wrapset \"baz-gwrap\")"
BUILT_SOURCES = baz-gwrap.c baz-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) baz-gwrap.html
-DISTCLEANFILES = baz-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-foo/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnc-module/test/mod-foo/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -12,10 +12,10 @@
libfoo_la_SOURCES = foo.c
noinst_HEADERS = \
- foo.h \
- foo-gwrap.h
+ foo.h
-libgncmodfoo_la_SOURCES = foo-gwrap.c gnc-mod-foo.c
+libgncmodfoo_la_SOURCES = gnc-mod-foo.c
+nodist_libgncmodfoo_la_SOURCES = foo-gwrap.c
libgncmodfoo_la_LIBADD = \
libfoo.la \
@@ -33,9 +33,8 @@
(gw:generate-wrapset \"foo-gwrap\")"
BUILT_SOURCES = foo-gwrap.c foo-gwrap.h
+CLEANFILES = $(BUILT_SOURCES) foo-gwrap.html
-DISTCLEANFILES = foo-gwrap.html
-
# Keep automake from generating install targets for test libs
install-checklibLTLIBRARIES:
uninstall-checklibLTLIBRARIES:
Modified: gnucash/branches/deprecated-cleanup/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -3,8 +3,8 @@
lib_LTLIBRARIES = libgncgnome.la libgw-gnc.la
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnc-spec.scm gw-gnc.scm
-#nodist_gwmod_DATA = gw-gnc.scm
+gwmod_DATA = gw-gnc-spec.scm
+nodist_gwmod_DATA = gw-gnc.scm
libgncgnome_la_LIBADD = \
${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
@@ -24,7 +24,7 @@
${G_WRAP_LINK_ARGS} \
${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
-libgw_gnc_la_SOURCES = gw-gnc.c
+nodist_libgw_gnc_la_SOURCES = gw-gnc.c
libgw_gnc_la_LDFLAGS = \
${G_WRAP_LINK_ARGS} ${GLIB_LIBS}
@@ -94,12 +94,10 @@
gnc-plugin-page-budget.h \
gnc-plugin-page-register.h \
gnc-split-reg.h \
- gw-gnc.h \
lot-viewer.h \
reconcile-list.h \
top-level.h \
- window-reconcile.h \
- gw-gnc.h
+ window-reconcile.h
EXTRA_DIST = \
gnucash.desktop.in \
@@ -167,5 +165,5 @@
(primitive-load \"./gw-gnc-spec.scm\") \
(gw:generate-wrapset \"gw-gnc\")"
BUILT_SOURCES = gw-gnc.scm gw-gnc.h gw-gnc.c
-CLEANFILES = gnucash.desktop gnucash g-wrapped .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnc.html
+CLEANFILES = $(BUILT_SOURCES) gnucash.desktop \
+ gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} gw-gnc.html
Modified: gnucash/branches/deprecated-cleanup/src/gnome/glade/account.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/glade/account.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/glade/account.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -347,6 +347,7 @@
<property name="right_attach">1</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
@@ -464,7 +465,7 @@
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
Modified: gnucash/branches/deprecated-cleanup/src/gnome/glade/budget.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/glade/budget.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/glade/budget.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1183,7 +1183,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">1 1 99 1 10 10</property>
+ <property name="adjustment">1 1 12 1 1 1</property>
</widget>
<packing>
<property name="left_attach">1</property>
Modified: gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-basic-commands.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-basic-commands.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-basic-commands.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -144,7 +144,7 @@
{ "ActionsScheduledTransactionEditorAction", NULL, N_("_Scheduled Transaction Editor"), NULL,
N_("The list of Scheduled Transactions"),
G_CALLBACK (gnc_main_window_cmd_actions_scheduled_transaction_editor) },
- { "ActionsSinceLastRunAction", NULL, N_("_Since Last Run..."), NULL,
+ { "ActionsSinceLastRunAction", NULL, N_("Since _Last Run..."), NULL,
N_("Create Scheduled Transactions since the last time run"),
G_CALLBACK (gnc_main_window_cmd_actions_since_last_run) },
{ "ActionsMortgageLoanAction", NULL, N_("_Mortgage & Loan Repayment..."), NULL,
Modified: gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-account-tree.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-account-tree.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-account-tree.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -161,7 +161,7 @@
G_CALLBACK (gnc_plugin_page_account_tree_cmd_open_subaccounts) },
/* Edit menu */
- { "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("_Edit Account"), "<control>e",
+ { "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit _Account"), "<control>e",
N_("Edit the selected account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_edit_account) },
{ "EditDeleteAccountAction", GNC_STOCK_DELETE_ACCOUNT, N_("_Delete Account..."), NULL,
@@ -191,7 +191,7 @@
{ "ScrubAction", NULL, N_("Check & Repair A_ccount"), NULL,
N_("Check for and repair unbalanced transactions and orphan splits " "in this account"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub) },
- { "ScrubSubAction", NULL, N_("Check & Repair Su_baccount"), NULL,
+ { "ScrubSubAction", NULL, N_("Check & Repair Su_baccounts"), NULL,
N_("Check for and repair unbalanced transactions and orphan splits "
"in this account and its subaccounts"),
G_CALLBACK (gnc_plugin_page_account_tree_cmd_scrub_sub) },
Modified: gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-register.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-register.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/gnc-plugin-page-register.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -179,7 +179,7 @@
{ "EditPasteAction", GTK_STOCK_PASTE, N_("_Paste"), NULL,
N_("Paste the clipboard content at the cursor position"),
G_CALLBACK (gnc_plugin_page_register_cmd_paste) },
- { "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit Account"), "<control>e",
+ { "EditEditAccountAction", GNC_STOCK_EDIT_ACCOUNT, N_("Edit _Account"), "<control>e",
N_("Edit the selected account"),
G_CALLBACK (gnc_plugin_page_register_cmd_edit_account) },
@@ -241,7 +241,7 @@
N_("Move to the blank transaction at the bottom of the register"),
G_CALLBACK (gnc_plugin_page_register_cmd_blank_transaction) },
{ "EditExchangeRateAction", NULL, N_("Edit E_xchange Rate"), NULL,
- N_("Exit the exchange rate for the current transaction"),
+ N_("Edit the exchange rate for the current transaction"),
G_CALLBACK (gnc_plugin_page_register_cmd_exchange_rate) },
{ "JumpTransactionAction", GNC_STOCK_JUMP_TO, N_("_Jump"), NULL,
N_("Jump to the corresponding transaction in the other account"),
Modified: gnucash/branches/deprecated-cleanup/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/schemas/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/schemas/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -5,6 +5,7 @@
apps_gnucash_dialog_prices.schemas.in \
apps_gnucash_dialog_print_checks.schemas.in \
apps_gnucash_dialog_reconcile.schemas.in \
+ apps_gnucash_dialog_scheduled_transctions.schemas.in \
apps_gnucash_dialog_totd.schemas.in \
apps_gnucash_general.schemas.in \
apps_gnucash_warnings.schemas.in \
Modified: gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_general.schemas.in
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_general.schemas.in 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_general.schemas.in 2006-07-30 04:57:40 UTC (rev 14581)
@@ -249,6 +249,21 @@
</schema>
<schema>
+ <key>/schemas/apps/gnucash/general/show_splash_screen</key>
+ <applyto>/apps/gnucash/general/show_splash_screen</applyto>
+ <owner>gnucash</owner>
+ <type>bool</type>
+ <default>TRUE</default>
+ <locale name="C">
+ <short>Show splash screen</short>
+ <long>
+ This setting determines whether GnuCash will show a splash screen
+ at startup.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/gnucash/general/register/use_theme_colors</key>
<applyto>/apps/gnucash/general/register/use_theme_colors</applyto>
<owner>gnucash</owner>
@@ -335,7 +350,7 @@
<locale name="C">
<short>Show horizontal borders in a register</short>
<long>
- Show horizontal borders between cells in a register. If active
+ Show horizontal borders between rows in a register. If active
the border between cells will be indicated with a heavy line.
Otherwise the border between cells will not be marked.
</long>
@@ -351,7 +366,7 @@
<locale name="C">
<short>Show vertical borders in a register</short>
<long>
- Show vertical borders between cells in a register. If active
+ Show vertical borders between columns in a register. If active
the border between cells will be indicated with a heavy line.
Otherwise the border between cells will not be marked.
</long>
@@ -462,5 +477,22 @@
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/gnucash/general/tab_position</key>
+ <applyto>/apps/gnucash/general/tab_position</applyto>
+ <owner>gnucash</owner>
+ <type>string</type>
+ <default>top</default>
+ <locale name="C">
+ <short>Position of the notebook tabs</short>
+ <long>
+ This setting determines the edge at which the tabs for
+ switching pages in notebooks are drawn. Possible values
+ are "top", "left", "bottom" and "right".
+ It defaults to "top".
+ </long>
+ </locale>
+ </schema>
+
</schemalist>
</gconfschemafile>
Modified: gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_warnings.schemas.in
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_warnings.schemas.in 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome/schemas/apps_gnucash_warnings.schemas.in 2006-07-30 04:57:40 UTC (rev 14581)
@@ -20,6 +20,22 @@
</schema>
<schema>
+ <key>/schemas/apps/gnucash/general/warnings/close_last_window</key>
+ <applyto>/apps/gnucash/general/warnings/permanent/close_last_window</applyto>
+ <applyto>/apps/gnucash/general/warnings/temporary/close_last_window</applyto>
+ <owner>gnucash</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Exit GnuCash</short>
+ <long>
+ This dialog is presented when you attempt to close the last GnuCash
+ window.
+ </long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/gnucash/general/warnings/mark_split_unreconciled</key>
<applyto>/apps/gnucash/general/warnings/permanent/mark_split_unreconciled</applyto>
<applyto>/apps/gnucash/general/warnings/temporary/mark_split_unreconciled</applyto>
Modified: gnucash/branches/deprecated-cleanup/src/gnome-search/search.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-search/search.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-search/search.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -77,7 +77,7 @@
<child>
<widget class="GtkLabel" id="label848">
<property name="visible">True</property>
- <property name="label" translatable="yes">_New item ...</property>
+ <property name="label" translatable="yes">_New item...</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -165,13 +165,10 @@
noinst_HEADERS = \
argv-list-converters.h \
- gnc-dir.h \
gnc-druid-gnome.h \
gnc-druid-provider-edge-gnome.h \
gnc-druid-provider-file-gnome.h \
gnc-druid-provider-multifile-gnome.h \
- gnc-version.h \
- gw-gnome-utils.h \
search-param.h
libgncmod_gnome_utils_la_LIBADD = \
@@ -198,7 +195,7 @@
${GOFFICE_LIBS} \
${LIBXML2_LIBS}
-libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c
+nodist_libgw_gnome_utils_la_SOURCES = gw-gnome-utils.c
libgw_gnome_utils_la_LIBADD = \
libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
@@ -209,7 +206,8 @@
${GLIB_LIBS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-gnome-utils.scm gw-gnome-utils-spec.scm
+gwmod_DATA = gw-gnome-utils-spec.scm
+nodist_gwmod_DATA = gw-gnome-utils.scm
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = gnome-utils.scm
@@ -312,8 +310,8 @@
(gw:generate-wrapset \"gw-gnome-utils\")"
BUILT_SOURCES += gw-gnome-utils.scm gw-gnome-utils.c gw-gnome-utils.h
-CLEANFILES = gnucash g-wrapped .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-gnome-utils.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped .scm-links \
+ ${SCM_FILE_LINKS} gw-gnome-utils.html
#
# I hate inconsistent standards. Autotools puts help files into
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/druid-gnc-xml-import.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/druid-gnc-xml-import.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/druid-gnc-xml-import.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -689,7 +689,7 @@
qof_session_begin (session, data->filename, TRUE, FALSE);
io_err = qof_session_get_error (session);
if (io_err != ERR_BACKEND_NO_ERR) {
- message = _("The file could not be reopen.");
+ message = _("The file could not be reopened.");
goto cleanup_parse_file;
}
@@ -708,7 +708,7 @@
goto cleanup_parse_file;
} else if (io_err != ERR_FILEIO_NO_ENCODING) {
/* another error, cannot handle this here */
- message = _("The file could not be reopen.");
+ message = _("The file could not be reopened.");
goto cleanup_parse_file;
}
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/glade/preferences.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/glade/preferences.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/glade/preferences.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -978,7 +978,7 @@
<child>
<widget class="GtkEntry" id="gconf/general/account_separator">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">The character that will be used between components of an account name. Legal values are any single non-alphanumeric unicode character, or any of the following strings: "colon" "slash", "backslash", "dash" and "period".</property>
+ <property name="tooltip" translatable="yes">The character that will be used between components of an account name. A legal value is any single character except letters and numbers, or any of the following strings: "colon" "slash", "backslash", "dash" and "period".</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -1180,7 +1180,7 @@
<child>
<widget class="GtkLabel" id="label101">
<property name="visible">True</property>
- <property name="label" translatable="yes">31.07.05</property>
+ <property name="label" translatable="yes">31.07.2005</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1204,7 +1204,7 @@
<child>
<widget class="GtkLabel" id="label100">
<property name="visible">True</property>
- <property name="label" translatable="yes">31/07/05</property>
+ <property name="label" translatable="yes">31/07/2005</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1228,7 +1228,7 @@
<child>
<widget class="GtkLabel" id="label99">
<property name="visible">True</property>
- <property name="label" translatable="yes">07/31/05</property>
+ <property name="label" translatable="yes">07/31/2005</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1300,7 +1300,7 @@
<child>
<widget class="GtkRadioButton" id="gconf/general/date_format/ce">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use the date format comon in continental Europe.</property>
+ <property name="tooltip" translatable="yes">Use the date format common in continental Europe.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Europe:</property>
<property name="use_underline">True</property>
@@ -1325,7 +1325,7 @@
<child>
<widget class="GtkRadioButton" id="gconf/general/date_format/uk">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use the date format comon in the United Kingdom.</property>
+ <property name="tooltip" translatable="yes">Use the date format common in the United Kingdom.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">U_K:</property>
<property name="use_underline">True</property>
@@ -1350,7 +1350,7 @@
<child>
<widget class="GtkRadioButton" id="gconf/general/date_format/us">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use the date format comon in the United States.</property>
+ <property name="tooltip" translatable="yes">Use the date format common in the United States.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_US:</property>
<property name="use_underline">True</property>
@@ -1568,8 +1568,8 @@
<packing>
<property name="left_attach">0</property>
<property name="right_attach">4</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
<property name="x_padding">12</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
@@ -1625,30 +1625,6 @@
</child>
<child>
- <widget class="GtkCheckButton" id="gconf/general/tab_close_buttons">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show a close button on each notebook tab. These function identically to the 'Close' menu item.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Show close button on _notebook tabs</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">4</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_padding">12</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -2044,6 +2020,30 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="gconf/general/show_splash_screen">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show splash screen at startup.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show splash scree_n</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="tab_expand">False</property>
@@ -3020,7 +3020,7 @@
<widget class="GtkTable" id="table5">
<property name="border_width">6</property>
<property name="visible">True</property>
- <property name="n_rows">9</property>
+ <property name="n_rows">18</property>
<property name="n_columns">4</property>
<property name="homogeneous">False</property>
<property name="row_spacing">0</property>
@@ -3078,9 +3078,9 @@
<child>
<widget class="GtkRadioButton" id="gconf/general/toolbar_style/both_horiz">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Display toolbar items with the text label beside the icon. Labels are only shown for the most frequently used items.</property>
+ <property name="tooltip" translatable="yes">Display toolbar items with the text label beside the icon. Labels are only shown for the most important items.</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Text besi_de icons</property>
+ <property name="label" translatable="yes">Priority text besi_de icons</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3130,7 +3130,7 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Use the system setting for displaying toolbar items.</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use s_ystem _default</property>
+ <property name="label" translatable="yes">Use s_ystem default</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3244,6 +3244,225 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label110">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">12</property>
+ <property name="bottom_attach">13</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label111">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Tab Position</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">13</property>
+ <property name="bottom_attach">14</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/general/tab_position/top">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display the notebook tabs at the top of the window.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">To_p</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">14</property>
+ <property name="bottom_attach">15</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/general/tab_position/bottom">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display the notebook tabs at the bottom of the window.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">B_ottom</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">gconf/general/tab_position/top</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">15</property>
+ <property name="bottom_attach">16</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/general/tab_position/left">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display the notebook tabs at the left of the window.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Left</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">gconf/general/tab_position/top</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">16</property>
+ <property name="bottom_attach">17</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkRadioButton" id="gconf/general/tab_position/right">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Display the notebook tabs at the right of the window.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Right</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">gconf/general/tab_position/top</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">17</property>
+ <property name="bottom_attach">18</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label112">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">9</property>
+ <property name="bottom_attach">10</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label113">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Close Button</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">10</property>
+ <property name="bottom_attach">11</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="gconf/general/tab_close_buttons">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show a close button on each notebook tab. These function identically to the 'Close' menu item.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Show close button on _notebook tabs</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">11</property>
+ <property name="bottom_attach">12</property>
+ <property name="x_padding">12</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="tab_expand">False</property>
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-file.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-file.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-file.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -437,7 +437,7 @@
break;
case ERR_FILEIO_WRITE_ERROR:
- fmt = _("Could not write to file %s Check that you have "
+ fmt = _("Could not write to file %s. Check that you have "
"permission to write to this file and that "
"there is sufficient space to create it.");
gnc_error_dialog(parent, fmt, newfile);
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-gnome-utils.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-gnome-utils.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -385,7 +385,8 @@
return main_window;
}
- gnc_gui_init_splash();
+ if (gnc_gconf_get_bool(GCONF_GENERAL, "show_splash_screen", NULL))
+ gnc_gui_init_splash();
gnome_is_initialized = TRUE;
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-main-window.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-main-window.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-main-window.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -83,6 +83,7 @@
#define PLUGIN_PAGE_CLOSE_BUTTON "close-button"
#define KEY_SHOW_CLOSE_BUTTON "tab_close_buttons"
+#define KEY_TAB_POSITION "tab_position"
/* Static Globals *******************************************************/
@@ -108,6 +109,9 @@
/* Callbacks */
static void gnc_main_window_add_widget (GtkUIManager *merge, GtkWidget *widget, GncMainWindow *window);
static void gnc_main_window_switch_page (GtkNotebook *notebook, GtkNotebookPage *notebook_page, gint pos, GncMainWindow *window);
+#ifdef HAVE_GTK_2_10
+static void gnc_main_window_page_reordered (GtkNotebook *notebook, GtkWidget *child, guint pos, GncMainWindow *window);
+#endif
static void gnc_main_window_plugin_added (GncPlugin *manager, GncPlugin *plugin, GncMainWindow *window);
static void gnc_main_window_plugin_removed (GncPlugin *manager, GncPlugin *plugin, GncMainWindow *window);
@@ -546,41 +550,49 @@
priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
/* Get the window coordinates, etc. */
- pos = g_key_file_get_integer_list(data->key_file, window_group,
- WINDOW_POSITION, &length, &error);
+ geom = g_key_file_get_integer_list(data->key_file, window_group,
+ WINDOW_GEOMETRY, &length, &error);
if (error) {
g_warning("error reading group %s key %s: %s",
- window_group, WINDOW_POSITION, error->message);
+ window_group, WINDOW_GEOMETRY, error->message);
g_error_free(error);
error = NULL;
} else if (length != 2) {
g_warning("invalid number of values for group %s key %s",
- window_group, WINDOW_POSITION);
+ window_group, WINDOW_GEOMETRY);
} else {
- gtk_window_move(GTK_WINDOW(window), pos[0], pos[1]);
- DEBUG("window (%p) position %dx%d", window, pos[0], pos[1]);
+ gtk_window_resize(GTK_WINDOW(window), geom[0], geom[1]);
+ DEBUG("window (%p) size %dx%d", window, geom[0], geom[1]);
}
- if (pos) {
- g_free(pos);
- }
+ /* keep the geometry for a test whether the windows position
+ is offscreen */
- geom = g_key_file_get_integer_list(data->key_file, window_group,
- WINDOW_GEOMETRY, &length, &error);
+ pos = g_key_file_get_integer_list(data->key_file, window_group,
+ WINDOW_POSITION, &length, &error);
if (error) {
g_warning("error reading group %s key %s: %s",
- window_group, WINDOW_GEOMETRY, error->message);
+ window_group, WINDOW_POSITION, error->message);
g_error_free(error);
error = NULL;
} else if (length != 2) {
g_warning("invalid number of values for group %s key %s",
- window_group, WINDOW_GEOMETRY);
+ window_group, WINDOW_POSITION);
+ } else if ((pos[0] + (geom ? geom[0] : 0) < 0) ||
+ (pos[0] > gdk_screen_width()) ||
+ (pos[1] + (geom ? geom[1] : 0) < 0) ||
+ (pos[1] > gdk_screen_height())) {
+ g_debug("position %dx%d, size%dx%d is offscreen; will not move",
+ pos[0], pos[1], geom[0], geom[1]);
} else {
- gtk_window_resize(GTK_WINDOW(window), geom[0], geom[1]);
- DEBUG("window (%p) size %dx%d", window, geom[0], geom[1]);
+ gtk_window_move(GTK_WINDOW(window), pos[0], pos[1]);
+ DEBUG("window (%p) position %dx%d", window, pos[0], pos[1]);
}
if (geom) {
g_free(geom);
}
+ if (pos) {
+ g_free(pos);
+ }
max = g_key_file_get_boolean(data->key_file, window_group,
WINDOW_MAXIMIZED, &error);
@@ -1024,7 +1036,7 @@
GTK_STOCK_QUIT, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- response = gtk_dialog_run (GTK_DIALOG (dialog));
+ response = gnc_dialog_run (GTK_DIALOG (dialog), "close_last_window");
gtk_widget_destroy(dialog);
if (response == GTK_RESPONSE_OK) {
@@ -1881,6 +1893,9 @@
priv->usage_order = g_list_prepend (priv->usage_order, page);
gtk_notebook_append_page_menu (notebook, page->notebook_page,
tab_hbox, menu_label);
+#ifdef HAVE_GTK_2_10
+ gtk_notebook_set_tab_reorderable (notebook, page->notebook_page, TRUE);
+#endif
gnc_plugin_page_inserted (page);
gtk_notebook_set_current_page (notebook, -1);
if (GNC_PLUGIN_PAGE_GET_CLASS(page)->window_changed)
@@ -2355,6 +2370,28 @@
LEAVE("");
}
+static void
+gnc_main_window_update_tab_position (GncMainWindow *window)
+{
+ GtkPositionType position = GTK_POS_TOP;
+ gchar *conf_string;
+ GncMainWindowPrivate *priv;
+
+ ENTER ("window %p", window);
+ conf_string = gnc_gconf_get_string (GCONF_GENERAL,
+ KEY_TAB_POSITION, NULL);
+ if (conf_string) {
+ position = gnc_enum_from_nick (GTK_TYPE_POSITION_TYPE,
+ conf_string, GTK_POS_TOP);
+ g_free (conf_string);
+ }
+
+ priv = GNC_MAIN_WINDOW_GET_PRIVATE (window);
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (priv->notebook), position);
+
+ LEAVE ("");
+}
+
/*
* Based on code from Epiphany (src/ephy-window.c)
*/
@@ -2488,6 +2525,8 @@
key_tail++;
if (strcmp(key_tail, KEY_TOOLBAR_STYLE) == 0) {
gnc_main_window_update_toolbar(window);
+ } else if (strcmp(key_tail, KEY_TAB_POSITION) == 0) {
+ gnc_main_window_update_tab_position(window);
}
}
@@ -2615,6 +2654,10 @@
gtk_widget_show (priv->notebook);
g_signal_connect (G_OBJECT (priv->notebook), "switch-page",
G_CALLBACK (gnc_main_window_switch_page), window);
+#ifdef HAVE_GTK_2_10
+ g_signal_connect (G_OBJECT (priv->notebook), "page-reordered",
+ G_CALLBACK (gnc_main_window_page_reordered), window);
+#endif
gtk_box_pack_start (GTK_BOX (main_vbox), priv->notebook,
TRUE, TRUE, 0);
@@ -2692,6 +2735,7 @@
gnc_gconf_add_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE,
gnc_main_window_gconf_changed);
gnc_main_window_update_toolbar(window);
+ gnc_main_window_update_tab_position(window);
gnc_main_window_init_menu_updaters(window);
@@ -2835,7 +2879,47 @@
LEAVE(" ");
}
+#ifdef HAVE_GTK_2_10
+/** This function is invoked when a GtkNotebook tab gets reordered by
+ * drag and drop. It adjusts the list installed_pages to reflect the new
+ * ordering so that GnuCash saves and restores the tabs correctly.
+ *
+ * @internal
+ */
static void
+gnc_main_window_page_reordered (GtkNotebook *notebook,
+ GtkWidget *child,
+ guint pos,
+ GncMainWindow *window)
+{
+ GncMainWindowPrivate *priv;
+ GncPluginPage *page;
+ GList *old_link;
+
+ ENTER("Notebook %p, child %p, index %d, window %p",
+ notebook, child, pos, window);
+ g_return_if_fail (GNC_IS_MAIN_WINDOW (window));
+
+ if (!child) return;
+
+ priv = GNC_MAIN_WINDOW_GET_PRIVATE(window);
+
+ page = g_object_get_data (G_OBJECT (child), PLUGIN_PAGE_LABEL);
+ if (!page) return;
+
+ old_link = g_list_find (priv->installed_pages, page);
+ if (!old_link) return;
+
+ priv->installed_pages = g_list_delete_link (priv->installed_pages,
+ old_link);
+ priv->installed_pages = g_list_insert (priv->installed_pages,
+ page, pos);
+
+ LEAVE(" ");
+}
+#endif
+
+static void
gnc_main_window_plugin_added (GncPlugin *manager,
GncPlugin *plugin,
GncMainWindow *window)
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-tree-view.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-tree-view.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-tree-view.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -903,7 +903,7 @@
return;
order = gnc_enum_from_nick(GTK_TYPE_SORT_TYPE, name, GTK_SORT_ASCENDING);
if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
- ¤t, &order))
+ ¤t, NULL))
current = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
g_signal_handler_block(s_model, priv->sort_column_changed_cb_id);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
Modified: gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -87,9 +87,6 @@
/* hbci_account (direct) -> gnucash_account -- DO NOT DELETE THE KEYS! */
GHashTable *gnc_hash;
- /* Status of user's movement through the wizard */
- Infostate state;
-
};
static void
@@ -318,25 +315,6 @@
}
-static gboolean
-on_accountlist_back (GnomeDruidPage *gnomedruidpage,
- gpointer arg1,
- gpointer user_data)
-{
- HBCIInitialInfo *info = user_data;
- g_assert(info);
-
- switch (info->state) {
- case INI_MATCH_ACCOUNTS:
- case MATCH_ACCOUNTS:
- gnome_druid_set_page (GNOME_DRUID (info->druid),
- GNOME_DRUID_PAGE (info->filepage));
- return TRUE;
- default:
- return FALSE;
- }
-}
-
static void
on_accountlist_prepare (GnomeDruidPage *gnomedruidpage,
gpointer arg1,
@@ -420,28 +398,6 @@
-static void
-on_button_clicked (GtkButton *button,
- gpointer user_data)
-{
- HBCIInitialInfo *info = user_data;
- const char *name;
- g_assert(info->druid);
-
- name = gtk_widget_get_name (GTK_WIDGET (button));
- if (strcmp (name, "aqhbci_button") == 0) {
-/* info->state = ADD_BANK; */
- /* gnome_druid_set_page (GNOME_DRUID (info->druid),
- GNOME_DRUID_PAGE (info->bankpage)); */
- } else if (strcmp (name, "updatelist_button") == 0) {
- info->state = UPDATE_ACCOUNTS;
- /* Nothing else to do. */
- } else {
- printf("on_button_clicked: Oops, unknown button: %s\n",
- name);
- }
-}
-
#if (AQBANKING_VERSION_MAJOR > 1) || \
((AQBANKING_VERSION_MAJOR == 1) && \
(AQBANKING_VERSION_MINOR == 9) && \
@@ -591,8 +547,12 @@
/* Call the qt wizard. See the note above about why this approach
is chosen. */
- /* In gtk2, this would be g_spawn_async or similar. */
+ /* Reset existing mapping tables */
AB_Banking_Fini (info->api);
+ if (info->gnc_hash != NULL)
+ g_hash_table_destroy (info->gnc_hash);
+ info->gnc_hash = NULL;
+ /* In gtk2, this would be g_spawn_async or similar. */
{
pid_t pid;
pid = fork();
@@ -736,16 +696,8 @@
selection = gtk_tree_view_get_selection(info->accountview);
g_signal_connect (selection, "changed",
G_CALLBACK (on_accountlist_changed), info);
- g_signal_connect (glade_xml_get_widget (xml, "aqhbci_again_button"),
- "clicked",
- G_CALLBACK (on_aqhbci_button), info);
- g_signal_connect (glade_xml_get_widget (xml, "updatelist_button"),
- "clicked",
- G_CALLBACK (on_button_clicked), info);
g_signal_connect (page, "prepare",
G_CALLBACK (on_accountlist_prepare), info);
- g_signal_connect (page, "back",
- G_CALLBACK (on_accountlist_back), info);
}
Modified: gnucash/branches/deprecated-cleanup/src/import-export/hbci/glade/hbci.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/hbci/glade/hbci.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/import-export/hbci/glade/hbci.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -185,64 +185,30 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="hbox112">
+ <widget class="GtkVBox" id="vbox157">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
- <widget class="GtkVBox" id="vbox157">
+ <widget class="GtkScrolledWindow" id="scrolledwindow25">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow25">
+ <widget class="GtkTreeView" id="account_page_view">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="account_page_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">True</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <property name="fixed_height_mode">False</property>
- </widget>
- </child>
+ <property name="can_focus">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">True</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
-
- <child>
- <widget class="GtkLabel" id="label828">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Click on the line of a HBCI account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching.</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -252,78 +218,23 @@
</child>
<child>
- <widget class="GtkFrame" id="frame72">
+ <widget class="GtkLabel" id="label828">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkVBox" id="vbox144">
- <property name="border_width">5</property>
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">5</property>
-
- <child>
- <widget class="GtkButton" id="updatelist_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Update
-account list</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="aqhbci_again_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">AqHBCI
-Setup</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label8877442">
- <property name="visible">True</property>
- <property name="label" translatable="yes">HBCI Setup</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Click on the line of a HBCI account name if you want to match it to a GnuCash account. Click "Forward" when all desired accounts are matching.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
</widget>
Modified: gnucash/branches/deprecated-cleanup/src/import-export/import-provider-format.glade
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/import-provider-format.glade 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/import-export/import-provider-format.glade 2006-07-30 04:57:40 UTC (rev 14581)
@@ -38,7 +38,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">The QIF file format does not specify which order the day, month, and year components of a date are printed. In most cases, it is possible to automatically determine which format is in use in a particular file. However, in the file you have just imported there exist more than one possible format that fits the data.
-Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-year-day.
+Please select a date format for the file. QIF files created by European software are likely to be in "d-m-y" or day-month-year format, where US QIF files are likely to be "m-d-y" or month-day-year.
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
Modified: gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-file.scm
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-file.scm 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-file.scm 2006-07-30 04:57:40 UTC (rev 14581)
@@ -79,7 +79,7 @@
;; now do something with the line
(if
(eq? tag #\!)
- (begin
+ (let ((old-qstate qstate-type))
(set! qstate-type (qif-parse:parse-bang-field value))
(case qstate-type
((type:bank type:cash type:ccard type:invst type:port
@@ -101,7 +101,17 @@
((option:autoswitch)
(set! ignore-accounts #t))
((clear:autoswitch)
- (set! ignore-accounts #f))))
+ (set! ignore-accounts #f))
+ (else
+ ;; Ignore any other "option:" identifiers and
+ ;; just return to the previously known !type
+ (if (string-match "^option:"
+ (symbol->string qstate-type))
+ (begin
+ (display "qif-file:read-file ignoring ")
+ (write qstate-type)
+ (newline)
+ (set! qstate-type old-qstate))))))
;;; (#t
;;; (display "qif-file:read-file can't handle ")
Modified: gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-parse.scm
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-parse.scm 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/import-export/qif-import/qif-parse.scm 2006-07-30 04:57:40 UTC (rev 14581)
@@ -23,7 +23,7 @@
(define comma-radix-regexp
(make-regexp
- "^ *\\$?[+-]?\\$?[0-9]+$|^ *\\$?[+-]?\\$?[0-9]?[0-9]?[0-9]?(\\.[0-9][0-9][0-9])*(,[0-9]*) *$|^ *\\$?[+-]?\\$?[0-9]+,[0-9]* *$"))
+ "^ *\\$?[+-]?\\$?[0-9]+$|^ *\\$?[+-]?\\$?[0-9]?[0-9]?[0-9]?(\\.[0-9][0-9][0-9])*(,[0-9]*)? *$|^ *\\$?[+-]?\\$?[0-9]+,[0-9]* *$"))
(define integer-regexp (make-regexp "^\\$?[+-]?\\$?[0-9]+ *$"))
Modified: gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-control.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-control.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-control.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -675,19 +675,17 @@
return FALSE;
/* now perform the completion */
-
- gnc_suspend_gui_refresh ();
-
- info->pending_trans_guid = *xaccTransGetGUID(trans);
if ((pending_trans != NULL) && (pending_trans != trans)) {
+ if (gnc_split_register_begin_edit_or_warn(info, trans))
+ return TRUE;
+
if (xaccTransIsOpen (pending_trans))
xaccTransCommitEdit (pending_trans);
else g_assert_not_reached();
- g_assert(!xaccTransIsOpen(trans));
- xaccTransBeginEdit(trans);
}
g_assert(xaccTransIsOpen(trans));
pending_trans = trans;
+ gnc_suspend_gui_refresh ();
gnc_copy_trans_onto_trans (auto_trans, trans, FALSE, FALSE);
blank_split = NULL;
@@ -1466,7 +1464,7 @@
/* Does the user want to be warned? */
window = gnc_split_register_get_parent(reg);
dialog =
- gtk_message_dialog_new_with_markup(GTK_WINDOW(window),
+ gtk_message_dialog_new(GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CANCEL,
Modified: gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-model.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-model.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register-model.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -1676,7 +1676,7 @@
/* Does the user want to be warned? */
window = gnc_split_register_get_parent(reg);
dialog =
- gtk_message_dialog_new_with_markup(GTK_WINDOW(window),
+ gtk_message_dialog_new(GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CANCEL,
Modified: gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.c 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.c 2006-07-30 04:57:40 UTC (rev 14581)
@@ -143,6 +143,24 @@
return denom;
}
+/* returns TRUE if begin_edit was aborted */
+gboolean
+gnc_split_register_begin_edit_or_warn(SRInfo *info, Transaction *trans)
+{
+ if (!xaccTransIsOpen(trans)) {
+ xaccTransBeginEdit(trans);
+ /* This is now the pending transaction */
+ info->pending_trans_guid = *xaccTransGetGUID(trans);
+ return FALSE;
+ } else {
+ GtkWidget *parent = NULL;
+ if (info->get_parent)
+ parent = info->get_parent(info->user_data);
+ gnc_error_dialog(parent, "%s", _("This transaction is already being edited in another register. Please finish editing it there first."));
+ return TRUE;
+ }
+}
+
void
gnc_split_register_expand_current_trans (SplitRegister *reg, gboolean expand)
{
@@ -829,9 +847,8 @@
g_assert(xaccTransIsOpen(trans));
} else {
g_assert(!pending_trans);
- g_assert(!xaccTransIsOpen(trans));
- xaccTransBeginEdit(trans);
- info->pending_trans_guid = *xaccTransGetGUID(trans);
+ if (gnc_split_register_begin_edit_or_warn(info, trans))
+ return;
}
xaccSplitDestroy (split);
@@ -1001,10 +1018,8 @@
trans = xaccSplitGetParent(split);
if (!pending) {
- g_assert(!xaccTransIsOpen(trans));
- xaccTransBeginEdit(trans);
- /* This is now the pending transaction */
- info->pending_trans_guid = *xaccTransGetGUID(trans);
+ if (gnc_split_register_begin_edit_or_warn(info, trans))
+ return;
} else if (pending == trans) {
g_assert(xaccTransIsOpen(trans));
} else g_assert_not_reached();
@@ -1351,15 +1366,12 @@
if (gnc_split_register_handle_exchange (reg, FALSE))
return TRUE;
- gnc_suspend_gui_refresh ();
-
/* determine whether we should commit the pending transaction */
if (pending_trans != trans)
{
// FIXME: How could the pending transaction not be open?
// FIXME: For that matter, how could an open pending
// transaction ever not be the current trans?
- info->pending_trans_guid = *xaccTransGetGUID(trans);
if (xaccTransIsOpen (pending_trans)) {
g_message("Impossible? commiting pending %p", pending_trans);
xaccTransCommitEdit (pending_trans);
@@ -1371,10 +1383,13 @@
g_assert(xaccTransIsOpen(blank_trans));
} else {
PINFO("beginning edit of trans %p", trans);
- xaccTransBeginEdit (trans);
+ if (gnc_split_register_begin_edit_or_warn(info, trans))
+ return FALSE;
}
pending_trans = trans;
}
+ g_assert(xaccTransIsOpen(trans));
+ gnc_suspend_gui_refresh ();
/* If we are committing the blank split, add it to the account now */
if (trans == blank_trans)
Modified: gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.h
===================================================================
--- gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.h 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/register/ledger-core/split-register.h 2006-07-30 04:57:40 UTC (rev 14581)
@@ -431,6 +431,10 @@
gboolean
gnc_split_register_handle_exchange (SplitRegister *reg, gboolean force_dialog);
+/* returns TRUE if begin_edit was aborted */
+gboolean
+gnc_split_register_begin_edit_or_warn(SRInfo *info, Transaction *trans);
+
/** @} */
/** @} */
/* -------------------------------------------------------------- */
Modified: gnucash/branches/deprecated-cleanup/src/register/register-core/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/register/register-core/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/register/register-core/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -50,17 +50,15 @@
table-layout.h \
table-model.h
-libgw_register_core_la_SOURCES = gw-register-core.c
+nodist_libgw_register_core_la_SOURCES = gw-register-core.c
libgw_register_core_la_LIBADD = \
libgncmod-register-core.la \
${G_WRAP_LINK_ARGS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-register-core.scm gw-register-core-spec.scm
+gwmod_DATA = gw-register-core-spec.scm
+nodist_gwmod_DATA = gw-register-core.scm
-noinst_HEADERS = \
- gw-register-core.h
-
EXTRA_DIST = \
${gwmod_DATA}
@@ -105,5 +103,5 @@
(gw:generate-wrapset \"gw-register-core\")"
BUILT_SOURCES = gw-register-core.scm gw-register-core.c gw-register-core.h
-CLEANFILES = gnucash g-wrapped register .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-register-core.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped register .scm-links \
+ ${SCM_FILE_LINKS} gw-register-core.html
Modified: gnucash/branches/deprecated-cleanup/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/report/report-gnome/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/report/report-gnome/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -51,13 +51,14 @@
${QOF_LIBS} \
${GLIB_LIBS}
-libgw_report_gnome_la_SOURCES = gw-report-gnome.c
+nodist_libgw_report_gnome_la_SOURCES = gw-report-gnome.c
libgw_report_gnome_la_LIBADD = \
libgncmod-report-gnome.la \
${G_WRAP_LINK_ARGS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-report-gnome.scm gw-report-gnome-spec.scm
+gwmod_DATA = gw-report-gnome-spec.scm
+nodist_gwmod_DATA = gw-report-gnome.scm
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report
gncmod_DATA = report-gnome.scm
@@ -72,9 +73,6 @@
ui_DATA = \
gnc-plugin-page-report-ui.xml
-noinst_HEADERS = \
- gw-report-gnome.h
-
EXTRA_DIST = \
${glade_DATA} \
${gwmod_DATA} \
@@ -114,5 +112,5 @@
(gw:generate-wrapset \"gw-report-gnome\")"
BUILT_SOURCES = gw-report-gnome.scm gw-report-gnome.c gw-report-gnome.h
-CLEANFILES = gnucash g-wrapped report .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-gnome.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \
+ ${SCM_FILE_LINKS} gw-report-gnome.html
Modified: gnucash/branches/deprecated-cleanup/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/deprecated-cleanup/src/report/report-system/Makefile.am 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/report/report-system/Makefile.am 2006-07-30 04:57:40 UTC (rev 14581)
@@ -68,15 +68,15 @@
endif
touch .scm-links
-libgw_report_system_la_SOURCES = gw-report-system.c
+nodist_libgw_report_system_la_SOURCES = gw-report-system.c
libgw_report_system_la_LIBADD = \
libgncmod-report-system.la \
${G_WRAP_LINK_ARGS}
gwmoddir = ${GNC_GWRAP_LIBDIR}
-gwmod_DATA = gw-report-system.scm gw-report-system-spec.scm
+gwmod_DATA = gw-report-system-spec.scm
+nodist_gwmod_DATA = gw-report-system.scm
-noinst_HEADERS = gw-report-system.h
noinst_DATA = .scm-links gw-report-system.h
EXTRA_DIST = ${gncscmmod_DATA} ${gncscm_DATA} ${gwmod_DATA}
@@ -93,5 +93,5 @@
(gw:generate-wrapset \"gw-report-system\")"
BUILT_SOURCES = gw-report-system.scm gw-report-system.c gw-report-system.h
-CLEANFILES = gnucash g-wrapped report .scm-links
-DISTCLEANFILES = ${SCM_FILE_LINKS} gw-report-system.html
+CLEANFILES = $(BUILT_SOURCES) gnucash g-wrapped report .scm-links \
+ ${SCM_FILE_LINKS} gw-report-system.html
Modified: gnucash/branches/deprecated-cleanup/src/report/report-system/html-text.scm
===================================================================
--- gnucash/branches/deprecated-cleanup/src/report/report-system/html-text.scm 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/report/report-system/html-text.scm 2006-07-30 04:57:40 UTC (rev 14581)
@@ -44,9 +44,6 @@
body
(gnc:make-html-style-table)))
-(define gnc:html-text?
- (record-predicate <html-text>))
-
(define gnc:html-text-body
(record-accessor <html-text> 'body))
Modified: gnucash/branches/deprecated-cleanup/src/report/report-system/report.scm
===================================================================
--- gnucash/branches/deprecated-cleanup/src/report/report-system/report.scm 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/src/report/report-system/report.scm 2006-07-30 04:57:40 UTC (rev 14581)
@@ -98,8 +98,10 @@
(hash-set! *gnc:_report-templates_*
(gnc:report-template-name report-rec) report-rec)
(begin
- (gnc:error "Refusing to add custom report with the same name as an existing report.")
- (gnc:error "Please edit your saved-reports file and delete the section for: " name)
+ ;; FIXME: We should pass the top-level window
+ ;; instead of the #f to gnc:error-dialog, but I
+ ;; have no idea where to get it from.
+ (gnc:error-dialog #f (string-append (_ "A custom report with this name already exists. Either rename the report to store it with a different name, or edit your saved-reports file and delete the section with the following name: ") name ))
)))
(gnc:warn "gnc:define-report: bad report"))))
Modified: gnucash/branches/deprecated-cleanup/util/gnc-svnversion
===================================================================
--- gnucash/branches/deprecated-cleanup/util/gnc-svnversion 2006-07-30 01:25:12 UTC (rev 14580)
+++ gnucash/branches/deprecated-cleanup/util/gnc-svnversion 2006-07-30 04:57:40 UTC (rev 14581)
@@ -47,7 +47,9 @@
if test $? != 0 ; then exit 1 ; fi
# Okay, we have 'svk'. Now see if $real_srcdir is an svk checkout
-svkinfo=`svk info "$real_srcdir" 2>&1`
+# Note that the 'echo n' is to protect against having svk installed
+# without having configured the depotmap.
+svkinfo=`echo n | svk info "$real_srcdir" 2>&1`
if test $? != 0 ; then exit 1 ; fi
# If we got here, then $real_srcdir is an svk checkout. Parse out
More information about the gnucash-changes
mailing list