IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restructure installed locations of tax related files

Browse Source 
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.
This commit is contained in:
Geert Janssens 2019-08-22 16:12:20 +02:00
parent d31a23d369
commit 2af0fa9849
9 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnucash/report/reports/locale-specific/de_DE/taxtxf.scm
View File

@ -71,7 +71,7 @@
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
(use-modules (gnucash core-utils)) ; for gnc:version (use-modules (gnucash core-utils)) ; for gnc:version
(use-modules (gnucash gettext)) (use-modules (gnucash gettext))
(use-modules (gnucash tax-de_DE)) (use-modules (gnucash locale de_DE tax))
(use-modules (gnucash gnc-module)) (use-modules (gnucash gnc-module))
(gnc:module-load "gnucash/report" 0) (gnc:module-load "gnucash/report" 0)

2
gnucash/report/reports/locale-specific/us/taxtxf.scm
View File

@ -103,7 +103,7 @@
(use-modules (srfi srfi-1)) (use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module)) (use-modules (gnucash gnc-module))
(use-modules (gnucash gettext)) (use-modules (gnucash gettext))
(use-modules (gnucash tax-us)) (use-modules (gnucash locale us tax))
(eval-when (eval-when
(compile load eval expand) (compile load eval expand)

18
libgnucash/tax/CMakeLists.txt
View File

@ -24,42 +24,42 @@ install(TARGETS gncmod-locale-tax
# Scheme # Scheme
set(gncmod_tax_us_SCHEME_1 us/txf.scm us/txf-help.scm) set(gncmod_tax_us_SCHEME_1 us/txf.scm us/txf-help.scm)
set(gncmod_tax_us_SCHEME_2 us/tax-us.scm) set(gncmod_tax_us_SCHEME_2 us/tax.scm)
set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf-de_DE.scm de_DE/txf-help-de_DE.scm) set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf.scm de_DE/txf-help.scm)
set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax-de_DE.scm) set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax.scm)
set(GUILE_DEPENDS scm-app-utils scm-gnc-module) set(GUILE_DEPENDS scm-app-utils scm-gnc-module)
gnc_add_scheme_targets(scm-tax-us-1 gnc_add_scheme_targets(scm-tax-us-1
"${gncmod_tax_us_SCHEME_1}" "${gncmod_tax_us_SCHEME_1}"
"gnucash/tax-us" "gnucash/locale/us/tax"
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
TRUE TRUE
) )
gnc_add_scheme_targets(scm-tax-us-2 gnc_add_scheme_targets(scm-tax-us-2
"${gncmod_tax_us_SCHEME_2}" "${gncmod_tax_us_SCHEME_2}"
gnucash "gnucash/locale/us"
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
FALSE FALSE
) )
gnc_add_scheme_targets(scm-tax-de_DE-1 gnc_add_scheme_targets(scm-tax-de_DE-1
"${gncmod_tax_de_DE_SCHEME_1}" "${gncmod_tax_de_DE_SCHEME_1}"
"gnucash/tax-de_DE" "gnucash/locale/de_DE/tax"
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
TRUE TRUE
) )
gnc_add_scheme_targets(scm-tax-de_DE-2 gnc_add_scheme_targets(scm-tax-de_DE-2
"${gncmod_tax_de_DE_SCHEME_2}" "${gncmod_tax_de_DE_SCHEME_2}"
gnucash "gnucash/locale/de_DE"
"${GUILE_DEPENDS}" "${GUILE_DEPENDS}"
FALSE FALSE
) )
# Module interfaces deprecated in 4.x, will be removed for 5.x # Module interfaces deprecated in 4.x, will be removed for 5.x
gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash tax-de_DE" "scm-tax-de_DE-2" "") gnc_add_scheme_deprecated_module ("gnucash tax de_DE" "gnucash locale de_DE tax" "scm-tax-de_DE-2" "")
gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash tax-us" "scm-tax-us-2" "") gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash locale us tax" "scm-tax-us-2" "")
add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 ) add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )

6
libgnucash/tax/de_DE/tax-de_DE.scm → libgnucash/tax/de_DE/tax.scm
View File

@ -17,7 +17,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org ;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash tax-de_DE)) (define-module (gnucash locale de_DE tax))
(use-modules (gnucash gnc-module)) (use-modules (gnucash gnc-module))
(eval-when (eval-when
@ -54,5 +54,5 @@
(export gnc:*tax-label* gnc:*tax-nr-label*) (export gnc:*tax-label* gnc:*tax-nr-label*)
(load-from-path "gnucash/tax-de_DE/txf-de_DE") (load-from-path "gnucash/locale/de_DE/tax/txf")
(load-from-path "gnucash/tax-de_DE/txf-help-de_DE") (load-from-path "gnucash/locale/de_DE/tax/txf-help")

0
libgnucash/tax/de_DE/txf-help-de_DE.scm → libgnucash/tax/de_DE/txf-help.scm
View File

0
libgnucash/tax/de_DE/txf-de_DE.scm → libgnucash/tax/de_DE/txf.scm
View File

4
libgnucash/tax/gncmod-locale-tax.c
View File

@ -80,9 +80,9 @@ libgncmod_locale_tax_gnc_module_init(int refcount)
gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0); gboolean is_de_DE = (strncmp(thislocale, "de_DE", 5) == 0);
# endif /* G_OS_WIN32 */ # endif /* G_OS_WIN32 */
if (is_de_DE) if (is_de_DE)
lmod("(gnucash tax-de_DE)"); lmod("(gnucash locale de_DE tax)");
else else
lmod("(gnucash tax-us)"); lmod("(gnucash locale us tax)");
return TRUE; return TRUE;
} }

6
libgnucash/tax/us/tax-us.scm → libgnucash/tax/us/tax.scm
View File

@ -17,7 +17,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org ;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash tax-us)) (define-module (gnucash locale us tax))
(export gnc:txf-get-payer-name-source) (export gnc:txf-get-payer-name-source)
(export gnc:txf-get-form) (export gnc:txf-get-form)
@ -40,5 +40,5 @@
(export txf-asset-categories) (export txf-asset-categories)
(export txf-liab-eq-categories) (export txf-liab-eq-categories)
(load-from-path "gnucash/tax-us/txf") (load-from-path "gnucash/locale/us/tax/txf")
(load-from-path "gnucash/tax-us/txf-help") (load-from-path "gnucash/locale/us/tax/txf-help")

8
po/POTFILES.in
View File

@ -695,10 +695,10 @@ libgnucash/gnc-module/gnc-module.c
libgnucash/gnc-module/gnc-module.scm libgnucash/gnc-module/gnc-module.scm
libgnucash/scm/price-quotes.scm libgnucash/scm/price-quotes.scm
libgnucash/scm/utilities.scm libgnucash/scm/utilities.scm
libgnucash/tax/de_DE/tax-de_DE.scm libgnucash/tax/de_DE/tax.scm
libgnucash/tax/de_DE/txf-de_DE.scm libgnucash/tax/de_DE/txf-help.scm
libgnucash/tax/de_DE/txf-help-de_DE.scm libgnucash/tax/de_DE/txf.scm
libgnucash/tax/gncmod-locale-tax.c libgnucash/tax/gncmod-locale-tax.c
libgnucash/tax/us/tax-us.scm libgnucash/tax/us/tax.scm
libgnucash/tax/us/txf-help.scm libgnucash/tax/us/txf-help.scm
libgnucash/tax/us/txf.scm libgnucash/tax/us/txf.scm