gnucash master: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Thu Aug 22 10:12:29 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/2af0fa98 (commit)
via https://github.com/Gnucash/gnucash/commit/d31a23d3 (commit)
via https://github.com/Gnucash/gnucash/commit/f5278621 (commit)
via https://github.com/Gnucash/gnucash/commit/a20c6099 (commit)
from https://github.com/Gnucash/gnucash/commit/f9dc1980 (commit)
commit 2af0fa98496b9801270580026cad6adf48db9047
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 16:12:20 2019 +0200
Restructure installed locations of tax related files
They are now under gnucash/locale/{us,de_DE}. This introduces a directory to add
any scm code that is locale specific. For now it's limited to tax rules for
the US or Germany.
commit d31a23d36997e2f614961195b5f68f290e7eb000
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 15:53:11 2019 +0200
Restructure tax source directory.
Put common code in the top-level, and locale specific code in
language specific subdirectories.
commit f5278621b0be9d27f928ff1b450dc106c9088741
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 15:35:26 2019 +0200
Rename module and related cmake rules from tax-us to locale-tax
commit a20c60990a424b45518ec52337a98416cd669984
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Aug 22 14:49:07 2019 +0200
Use one single module to load locale specific tax rather than a module per locale
This simplifies the calls in the rest of gnucash
Note that the locale specific reports themselves don't even load this module any more.
They don't need it, instead they can directly load the locale specific tax scheme modules.
Summary of changes:
gnucash/gnome/dialog-tax-info.c | 5 ++
gnucash/report/reports/CMakeLists.txt | 2 +-
.../reports/locale-specific/de_DE/taxtxf.scm | 2 +-
.../report/reports/locale-specific/us/taxtxf.scm | 2 +-
libgnucash/app-utils/gnc-ui-util.c | 21 ++----
libgnucash/tax/CMakeLists.txt | 75 ++++++++++++++++++++-
libgnucash/tax/{us/tax-de_DE.scm => de_DE/tax.scm} | 6 +-
.../tax/{us => }/de_DE/taxtxf - LIES MICH.txt | 0
libgnucash/tax/{us => }/de_DE/txf-USt-Bericht.html | 0
.../{us => }/de_DE/txf-USt-VA Anleitung 2011.pdf | Bin
.../{us/txf-help-de_DE.scm => de_DE/txf-help.scm} | 0
libgnucash/tax/{us/txf-de_DE.scm => de_DE/txf.scm} | 0
.../{us/gncmod-tax-us.c => gncmod-locale-tax.c} | 39 ++++-------
libgnucash/tax/test/CMakeLists.txt | 22 ++++++
libgnucash/tax/{us => }/test/test-link-module.c | 0
.../test-load-locale-tax-module.scm} | 4 +-
libgnucash/tax/us/CMakeLists.txt | 70 -------------------
libgnucash/tax/us/{tax-us.scm => tax.scm} | 6 +-
libgnucash/tax/us/test/CMakeLists.txt | 22 ------
po/POTFILES.in | 10 +--
20 files changed, 133 insertions(+), 153 deletions(-)
rename libgnucash/tax/{us/tax-de_DE.scm => de_DE/tax.scm} (93%)
rename libgnucash/tax/{us => }/de_DE/taxtxf - LIES MICH.txt (100%)
rename libgnucash/tax/{us => }/de_DE/txf-USt-Bericht.html (100%)
rename libgnucash/tax/{us => }/de_DE/txf-USt-VA Anleitung 2011.pdf (100%)
rename libgnucash/tax/{us/txf-help-de_DE.scm => de_DE/txf-help.scm} (100%)
rename libgnucash/tax/{us/txf-de_DE.scm => de_DE/txf.scm} (100%)
rename libgnucash/tax/{us/gncmod-tax-us.c => gncmod-locale-tax.c} (72%)
create mode 100644 libgnucash/tax/test/CMakeLists.txt
rename libgnucash/tax/{us => }/test/test-link-module.c (100%)
rename libgnucash/tax/{us/test/test-load-tax-us-module.scm => test/test-load-locale-tax-module.scm} (62%)
delete mode 100644 libgnucash/tax/us/CMakeLists.txt
rename libgnucash/tax/us/{tax-us.scm => tax.scm} (91%)
delete mode 100644 libgnucash/tax/us/test/CMakeLists.txt
More information about the gnucash-patches
mailing list