From 3061d31f0697498a5dc0b3d517f53ef3a64eb0f8 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 3 Dec 2014 12:04:49 +0100 Subject: [PATCH] Yet another guile 2 precompile fix of the German tax report The previous one only fixed part of the problem --- src/tax/us/de_DE.scm | 11 ++++++++++- src/tax/us/txf-de_DE.scm | 10 +--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/tax/us/de_DE.scm b/src/tax/us/de_DE.scm index 19474c1bfc..31c2f570f5 100644 --- a/src/tax/us/de_DE.scm +++ b/src/tax/us/de_DE.scm @@ -1,7 +1,16 @@ (define-module (gnucash tax de_DE)) (use-modules (gnucash gnc-module)) -(use-modules (gnucash gettext)) +(cond-expand + (guile-2 + (eval-when + (compile load eval expand) + (load-extension "libgncmod-engine" "scm_init_sw_engine_module") + (load-extension "libgncmod-app-utils" "scm_init_sw_app_utils_module"))) + (else )) +(use-modules (sw_app_utils)) +(use-modules (sw_engine)) +(use-modules (gnucash app-utils)) (export gnc:txf-get-payer-name-source) (export gnc:txf-get-form) diff --git a/src/tax/us/txf-de_DE.scm b/src/tax/us/txf-de_DE.scm index 6c0118a457..6fea6b8306 100644 --- a/src/tax/us/txf-de_DE.scm +++ b/src/tax/us/txf-de_DE.scm @@ -26,15 +26,7 @@ ;; http://www.felfri.de/winston/schnittstellen.htm ;; -(use-modules (gnucash gettext)) -(use-modules (sw_app_utils)) -(cond-expand - (guile-2 - (eval-when - (compile load eval expand) - (load-extension "libgncmod-engine" "scm_init_sw_engine_module"))) - (else )) -(use-modules (sw_engine)) +(use-modules (gnucash app-utils)) (define txf-tax-entity-types (list