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

RptCleanup - install reports into their own toplevel module (gnucash reports)

Browse Source
This commit is contained in:
Geert Janssens
2019-06-14 15:37:33 +02:00
parent 707f9a4029
commit 70393bc08a
71 changed files with 106 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -175,7 +175,7 @@ gnucash/report/locale-specific/gnucash
gnucash/report/locale-specific/test/test-link-module
gnucash/report/gnucash
gnucash/report/test/test-link-module
gnucash/report/reports/gnucash
gnucash/reports/gnucash
gnucash/report/stylesheets/gnucash
gnucash/report/utility-reports/gnucash
swig-*.c

2
gnucash/gnome/gnc-plugin-report-system.c
View File

@@ -266,7 +266,7 @@ gnc_plugin_report_system_new (void)
gnc_html_register_url_handler (URL_TYPE_REPORT, gnc_report_system_report_url_cb);
gnc_html_register_url_handler (URL_TYPE_HELP, gnc_report_system_help_url_cb);
scm_c_use_module("gnucash report reports");
scm_c_use_module("gnucash reports");
scm_c_use_module("gnucash report-menus");
scm_c_eval_string("(gnc:report-menu-setup)");

2
gnucash/gnome/report-menus.scm
View File

@@ -30,7 +30,7 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash gnome-utils))
(use-modules (gnucash gettext))
(use-modules (gnucash report reports standard dashboard))
(use-modules (gnucash reports standard dashboard))
(eval-when (compile load eval expand)
(load-extension "libgnc-gnome" "scm_init_sw_gnome_module"))

7
gnucash/report/html-document.scm
View File

@@ -146,9 +146,10 @@
(gnc:report-render-starting (gnc:html-document-title doc))
(when headers?
;;This is the only place where <html> appears
;;with the exception of 2 eguile report templates:
;;./share/gnucash/scm/gnucash/report/reports/data/taxinvoice.eguile.scm:<html>
;;./share/gnucash/scm/gnucash/report/reports/data/balsheet-eg.eguile.scm:<html>
;;with the exception of 3 eguile report templates:
;;<guile-sitedir>/gnucash/reports/data/taxinvoice.eguile.scm:<html>
;;<guile-sitedir>/gnucash/reports/data/balsheet-eg.eguile.scm:<html>
;;<guile-sitedir>/gnucash/reports/data/receipt.eguile.scm:<html>
(push "<html>\n")
(push "<head>\n")

4
gnucash/report/report.scm
View File

@@ -797,10 +797,10 @@
;; This assumes the modules are located on the file system in a
;; path matching the module prefix
;; For example passing
;; '('(gnucash report stylesheets) '(gnucash report reports standard))
;; '('(gnucash report stylesheets) '(gnucash reports standard))
;; will search for scm files in
;; - <gnc-guile-dir>/gnucash/report/stylesheets
;; - <gnc-guile-dir>/gnucash/report/reports/standard
;; - <gnc-guile-dir>/gnucash/reports/standard
;; and try to load them.
;; This function is non-recursive so it won't
;; descend in subdirectories.

8
gnucash/report/reports/CMakeLists.txt
View File

@@ -93,21 +93,21 @@ set(scm_rpt_std_GUILE_DEPENDS
gnc_add_scheme_targets(scm-rpt-reports
"${reports_SCHEME}"
"gnucash/report"
"gnucash"
"${scm_rpts_GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-reports-common
"${reports_common_SCHEME}"
"gnucash/report/reports"
"gnucash/reports"
"scm-reports-common-links;scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
gnc_add_scheme_targets(scm-reports-standard
"${reports_standard_SCHEME}"
"gnucash/report/reports/standard"
"gnucash/reports/standard"
"scm-rpt-reports;${scm_rpt_std_GUILE_DEPENDS}"
TRUE
)
@@ -115,7 +115,7 @@ gnc_add_scheme_targets(scm-reports-standard
gnc_add_scheme_targets(scm-reports-example
"${reports_example_SCHEME}"
"gnucash/report/reports/example"
"gnucash/reports/example"
"${scm_rpt_example_GUILE_DEPENDS}"
TRUE
)

2
gnucash/report/reports/aging.scm
View File

@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports aging))
(define-module (gnucash reports aging))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/example/average-balance.scm
View File

@@ -26,7 +26,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports example average-balance))
(define-module (gnucash reports example average-balance))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/example/daily-reports.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports example daily-reports))
(define-module (gnucash reports example daily-reports))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/example/hello-world.scm
View File

@@ -23,7 +23,7 @@
;; It illustrates the basic techniques used to create
;; new reports for GnuCash.
(define-module (gnucash report reports example hello-world))
(define-module (gnucash reports example hello-world))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/example/sample-graphs.scm
View File

@@ -23,7 +23,7 @@
;; It illustrates the basic techniques used to create
;; new reports for GnuCash.
(define-module (gnucash report reports example sample-graphs))
(define-module (gnucash reports example sample-graphs))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/example/welcome-to-gnucash.scm
View File

@@ -21,7 +21,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports example welcome-to-gnucash))
(define-module (gnucash reports example welcome-to-gnucash))
(use-modules (gnucash utilities))
(use-modules (gnucash core-utils)) ; for gnc:version

2
gnucash/report/reports/locale-specific/CMakeLists.txt
View File

@@ -40,7 +40,7 @@ set(GUILE_DEPENDS
gnc_add_scheme_targets(scm-reports-locale-specific-1
"${gncmod_locale_reports_SCHEME}"
gnucash/report/reports/locale-specific
gnucash/reports/locale-specific
"${GUILE_DEPENDS}"
FALSE
)

4
gnucash/report/reports/locale-specific/gncmod-locale-specific.c
View File

@@ -80,12 +80,12 @@ libgncmod_locale_specific_gnc_module_init(int refcount)
if (is_de_DE)
{
tax_module = "gnucash/tax/de_DE";
report_taxtxf = "(use-modules (gnucash report reports locale-specific taxtxf-de_DE))";
report_taxtxf = "(use-modules (gnucash reports locale-specific taxtxf-de_DE))";
}
else
{
tax_module = "gnucash/tax/us";
report_taxtxf = "(use-modules (gnucash report reports locale-specific taxtxf))";
report_taxtxf = "(use-modules (gnucash reports locale-specific taxtxf))";
}
/* The gchar* cast is only because the function declaration expects

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

@@ -66,7 +66,7 @@
;; depends must be outside module scope -- and should eventually go away.
(define-module (gnucash report reports locale-specific taxtxf-de_DE))
(define-module (gnucash reports locale-specific taxtxf-de_DE))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash core-utils)) ; for gnc:version

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

@@ -98,7 +98,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports locale-specific taxtxf))
(define-module (gnucash reports locale-specific taxtxf))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

12
gnucash/report/reports/reports.scm
View File

@@ -24,7 +24,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports))
(define-module (gnucash reports))
(use-modules (srfi srfi-13))
(use-modules (gnucash app-utils))
(use-modules (gnucash core-utils))
@@ -42,8 +42,8 @@
;owner-report-create)
(define report-dirs (list
'(gnucash report reports standard) ; base directory for standard reports included in gnucash
'(gnucash report reports example) ; base directory for example reports included in gnucash
'(gnucash reports standard) ; base directory for standard reports included in gnucash
'(gnucash reports example) ; base directory for example reports included in gnucash
))
(report-module-loader report-dirs)
@@ -78,15 +78,15 @@
0
))
(use-modules (gnucash report reports standard payables))
(use-modules (gnucash reports standard payables))
(define (gnc:payables-report-create account title show-zeros?)
(payables-report-create-internal account title show-zeros?))
(use-modules (gnucash report reports standard receivables))
(use-modules (gnucash reports standard receivables))
(define (gnc:receivables-report-create account title show-zeros?)
(receivables-report-create-internal account title show-zeros?))
(use-modules (gnucash report reports standard owner-report))
(use-modules (gnucash reports standard owner-report))
(define (gnc:owner-report-create owner account)
; Figure out an account to use if nothing exists here.
(if (null? account)

2
gnucash/report/reports/standard/account-piecharts.scm
View File

@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard account-piecharts))
(define-module (gnucash reports standard account-piecharts))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/account-summary.scm
View File

@@ -48,7 +48,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard account-summary))
(define-module (gnucash reports standard account-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/advanced-portfolio.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard advanced-portfolio))
(define-module (gnucash reports standard advanced-portfolio))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/balance-forecast.scm
View File

@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard balance-forecast))
(define-module (gnucash reports standard balance-forecast))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/balance-sheet.scm
View File

@@ -62,7 +62,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard balance-sheet))
(define-module (gnucash reports standard balance-sheet))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/balsheet-eg.scm
View File

@@ -31,7 +31,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard balsheet-eg))
(define-module (gnucash reports standard balsheet-eg))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard balsheet-pnl))
(define-module (gnucash reports standard balsheet-pnl))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/budget-balance-sheet.scm
View File

@@ -28,7 +28,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard budget-balance-sheet))
(define-module (gnucash reports standard budget-balance-sheet))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/budget-barchart.scm
View File

@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard budget-barchart))
(define-module (gnucash reports standard budget-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/budget-flow.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard budget-flow))
(define-module (gnucash reports standard budget-flow))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/budget-income-statement.scm
View File

@@ -40,7 +40,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard budget-income-statement))
(define-module (gnucash reports standard budget-income-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/budget.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard budget))
(define-module (gnucash reports standard budget))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/cash-flow.scm
View File

@@ -27,7 +27,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard cash-flow))
(define-module (gnucash reports standard cash-flow))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

4
gnucash/report/reports/standard/cashflow-barchart.scm
View File

@@ -27,13 +27,13 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard cashflow-barchart))
(define-module (gnucash reports standard cashflow-barchart))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))
(use-modules (gnucash engine))
(use-modules (gnucash report reports standard cash-flow))
(use-modules (gnucash reports standard cash-flow))
(gnc:module-load "gnucash/report" 0)

2
gnucash/report/reports/standard/category-barchart.scm
View File

@@ -23,7 +23,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; depends must be outside module scope -- and should eventually go away.
(define-module (gnucash report reports standard category-barchart))
(define-module (gnucash reports standard category-barchart))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/customer-summary.scm
View File

@@ -26,7 +26,7 @@
;; not only print a summary for one single owner (here: only
;; customers), but instead a table showing all customers.
(define-module (gnucash report reports standard customer-summary))
(define-module (gnucash reports standard customer-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/dashboard.scm
View File

@@ -22,7 +22,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard dashboard))
(define-module (gnucash reports standard dashboard))
(export gnc:make-dashboard)
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/equity-statement.scm
View File

@@ -45,7 +45,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard equity-statement))
(define-module (gnucash reports standard equity-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/general-journal.scm
View File

@@ -26,7 +26,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard general-journal))
(define-module (gnucash reports standard general-journal))
(export gnc:make-general-journal-report)
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/general-ledger.scm
View File

@@ -29,7 +29,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard general-ledger))
(define-module (gnucash reports standard general-ledger))
(export gnc:make-general-ledger-report)
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/income-gst-statement.scm
View File

@@ -25,7 +25,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard income-gst-statement))
(define-module (gnucash reports standard income-gst-statement))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/income-statement.scm
View File

@@ -41,7 +41,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard income-statement))
(define-module (gnucash reports standard income-statement))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/invoice.scm
View File

@@ -22,7 +22,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
(define-module (gnucash report reports standard invoice))
(define-module (gnucash reports standard invoice))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/job-report.scm
View File

@@ -24,7 +24,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
(define-module (gnucash report reports standard job-report))
(define-module (gnucash reports standard job-report))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/net-charts.scm
View File

@@ -26,7 +26,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard net-charts))
(define-module (gnucash reports standard net-charts))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/owner-report.scm
View File

@@ -25,7 +25,7 @@
;; Boston, MA 02110-1301, USA gnu@gnu.org
(define-module (gnucash report reports standard owner-report))
(define-module (gnucash reports standard owner-report))
(use-modules (srfi srfi-1))
(use-modules (gnucash gnc-module))

4
gnucash/report/reports/standard/payables.scm
View File

@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard payables))
(define-module (gnucash reports standard payables))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
(gnc:module-load "gnucash/report" 0)
(use-modules (gnucash report reports aging))
(use-modules (gnucash reports aging))
(define acc-page gnc:pagename-general)
(define this-acc (N_ "Payable Account"))

2
gnucash/report/reports/standard/portfolio.scm
View File

@@ -21,7 +21,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard portfolio))
(define-module (gnucash reports standard portfolio))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/price-scatter.scm
View File

@@ -22,7 +22,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard price-scatter))
(define-module (gnucash reports standard price-scatter))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/receipt.scm
View File

@@ -14,7 +14,7 @@
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
;; 02111-1307 USA
(define-module (gnucash report reports standard receipt))
(define-module (gnucash reports standard receipt))
(use-modules (ice-9 local-eval)) ; for the-environment
(use-modules (gnucash utilities))

4
gnucash/report/reports/standard/receivables.scm
View File

@@ -23,7 +23,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard receivables))
(define-module (gnucash reports standard receivables))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
@@ -31,7 +31,7 @@
(gnc:module-load "gnucash/report" 0)
(use-modules (gnucash report reports aging))
(use-modules (gnucash reports aging))
(define acc-page gnc:pagename-general)
(define this-acc (N_ "Receivables Account"))

2
gnucash/report/reports/standard/reconcile-report.scm
View File

@@ -24,7 +24,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard reconcile-report))
(define-module (gnucash reports standard reconcile-report))
(use-modules (gnucash gettext))
(use-modules (gnucash gnc-module))

2
gnucash/report/reports/standard/register.scm
View File

@@ -20,7 +20,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard register))
(define-module (gnucash reports standard register))
(use-modules (gnucash utilities))
(use-modules (srfi srfi-1))

2
gnucash/report/reports/standard/sx-summary.scm
View File

@@ -31,7 +31,7 @@
;; periods. Apart from this, all display options are taken from
;; account-summary unchangedly.
(define-module (gnucash report reports standard sx-summary))
(define-module (gnucash reports standard sx-summary))
(use-modules (srfi srfi-1))
(use-modules (gnucash utilities))

2
gnucash/report/reports/standard/taxinvoice.scm
View File

@@ -22,7 +22,7 @@
; - specify a different module name below (eg mytaxinvoice)
; - refer to it from .gnucash/config.user
; (see https://wiki.gnucash.org/wiki/Custom_Reports )
(define-module (gnucash report reports standard taxinvoice))
(define-module (gnucash reports standard taxinvoice))
(use-modules (ice-9 local-eval)) ; for the-environment
(use-modules (gnucash utilities))

4
gnucash/report/reports/standard/test/test-average-balance.scm
View File

@@ -2,9 +2,9 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(gnc:module-begin-syntax (gnc:module-load "gnucash/report" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports example average-balance))
(use-modules (gnucash reports example average-balance))
(use-modules (gnucash report))
(use-modules (gnucash report reports standard budget))
(use-modules (gnucash reports standard budget))
(use-modules (tests test-report-extras))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (tests srfi64-extras))

4
gnucash/report/reports/standard/test/test-balsheet-pnl.scm
View File

@@ -1,8 +1,8 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard balance-sheet))
(use-modules (gnucash report reports standard income-statement))
(use-modules (gnucash reports standard balance-sheet))
(use-modules (gnucash reports standard income-statement))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report))
(use-modules (tests test-report-extras))

2
gnucash/report/reports/standard/test/test-budget.scm
View File

@@ -30,7 +30,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard budget))
(use-modules (gnucash reports standard budget))
(use-modules (tests test-report-extras))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (tests test-engine-extras))

2
gnucash/report/reports/standard/test/test-cash-flow.scm
View File

@@ -3,7 +3,7 @@
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard cash-flow))
(use-modules (gnucash reports standard cash-flow))
(use-modules (gnucash report))
(define (run-test)

2
gnucash/report/reports/standard/test/test-cashflow-barchart.scm
View File

@@ -28,7 +28,7 @@
(use-modules (tests srfi64-extras))
(use-modules (gnucash report))
(use-modules (tests test-report-extras))
(use-modules (gnucash report reports standard cashflow-barchart))
(use-modules (gnucash reports standard cashflow-barchart))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-64))

12
gnucash/report/reports/standard/test/test-charts.scm
View File

@@ -1,12 +1,12 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash report reports standard account-piecharts))
(use-modules (gnucash report reports standard cashflow-barchart))
(use-modules (gnucash report reports standard price-scatter))
(use-modules (gnucash report reports example daily-reports))
(use-modules (gnucash reports standard category-barchart))
(use-modules (gnucash reports standard net-charts))
(use-modules (gnucash reports standard account-piecharts))
(use-modules (gnucash reports standard cashflow-barchart))
(use-modules (gnucash reports standard price-scatter))
(use-modules (gnucash reports example daily-reports))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report))
(use-modules (tests test-report-extras))

2
gnucash/report/reports/standard/test/test-income-gst.scm
View File

@@ -1,7 +1,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard income-gst-statement))
(use-modules (gnucash reports standard income-gst-statement))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report))
(use-modules (tests test-report-extras))

2
gnucash/report/reports/standard/test/test-invoice.scm
View File

@@ -1,7 +1,7 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard invoice))
(use-modules (gnucash reports standard invoice))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report))
(use-modules (tests test-report-extras))

2
gnucash/report/reports/standard/test/test-register.scm
View File

@@ -35,7 +35,7 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard register))
(use-modules (gnucash reports standard register))
(use-modules (tests test-report-extras))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (tests test-engine-extras))

4
gnucash/report/reports/standard/test/test-standard-category-report.scm
View File

@@ -35,9 +35,9 @@
(use-modules (gnucash app-utils))
(use-modules (gnucash engine))
(use-modules (sw_engine))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash reports standard net-charts))
(use-modules (tests test-report-extras))
(use-modules (gnucash report reports standard category-barchart))
(use-modules (gnucash reports standard category-barchart))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (tests test-engine-extras))

2
gnucash/report/reports/standard/test/test-standard-net-barchart.scm
View File

@@ -27,7 +27,7 @@
(use-modules (tests test-engine-extras))
(use-modules (tests srfi64-extras))
(use-modules (tests test-report-extras))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash reports standard net-charts))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")

2
gnucash/report/reports/standard/test/test-standard-net-linechart.scm
View File

@@ -27,7 +27,7 @@
(use-modules (tests test-engine-extras))
(use-modules (tests srfi64-extras))
(use-modules (tests test-report-extras))
(use-modules (gnucash report reports standard net-charts))
(use-modules (gnucash reports standard net-charts))
;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C")

4
gnucash/report/reports/standard/test/test-stress-options.scm
View File

@@ -4,9 +4,9 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard view-column))
(use-modules (gnucash reports standard view-column))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report reports standard taxinvoice))
(use-modules (gnucash reports standard taxinvoice))
(use-modules (gnucash report))
(use-modules (tests test-report-extras))
(use-modules (srfi srfi-64))

4
gnucash/report/reports/standard/test/test-transaction.scm
View File

@@ -1,8 +1,8 @@
(use-modules (gnucash gnc-module))
(gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
(use-modules (tests test-engine-extras))
(use-modules (gnucash report reports standard transaction))
(use-modules (gnucash report reports standard reconcile-report))
(use-modules (gnucash reports standard transaction))
(use-modules (gnucash reports standard reconcile-report))
(use-modules (gnucash report stylesheets plain)) ; For the default stylesheet, required for rendering
(use-modules (gnucash report))
(use-modules (tests test-report-extras))

2
gnucash/report/reports/standard/transaction.scm
View File

@@ -22,7 +22,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard transaction))
(define-module (gnucash reports standard transaction))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/trial-balance.scm
View File

@@ -50,7 +50,7 @@
;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define-module (gnucash report reports standard trial-balance))
(define-module (gnucash reports standard trial-balance))
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash gettext))

2
gnucash/report/reports/standard/view-column.scm
View File

@@ -26,7 +26,7 @@
;; edited in a special window. Every view gets a stylesheet so we
;; don't have to worry about that here.
(define-module (gnucash report reports standard view-column))
(define-module (gnucash reports standard view-column))
(use-modules (gnucash utilities))
(use-modules (gnucash app-utils))
(use-modules (gnucash gnc-module))

14
libgnucash/core-utils/gnc-path.c
View File

@@ -171,7 +171,7 @@ gchar *gnc_path_get_accountsdir()
}
/** Returns the file path to the directory containing all guile scripts, usually
* "$prefix/guile/site/2.2".
* "$prefix/guile/site/x.y".
* This path is determined by querying guile for its sitedir and then
* rebasing this to be relative to our own installation prefix.
*
@@ -186,7 +186,7 @@ gchar *gnc_path_get_scmdir()
}
/** Returns the file path to the report directory, usually
* "$prefix/share/gnucash/scm/gnucash/report".
* "$prefix/share/guile/site/x.y/gnucash/report".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportdir()
@@ -199,21 +199,21 @@ gchar *gnc_path_get_reportdir()
}
/** Returns the file path to the reports directory, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports".
* "$prefix/share/guile/site/x.y/gnucash/reports".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportsdir()
{
gchar *reportdir = gnc_path_get_reportdir ();
gchar *result = g_build_filename (reportdir, "reports", NULL);
g_free (reportdir);
gchar *scmdir = gnc_path_get_scmdir ();
gchar *result = g_build_filename (scmdir, "gnucash", "reports", NULL);
g_free (scmdir);
//printf("Returning reportsdir %s\n", result);
return result;
}
/** Returns the file path to the standard
* reports, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
* "$prefix/share/guile/site/x.y/gnucash/reports/standard".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir()

8
libgnucash/core-utils/gnc-path.h
View File

@@ -93,26 +93,26 @@ gchar *gnc_path_get_localedir(void);
gchar *gnc_path_get_accountsdir(void);
/** Returns the file path to the directory containing all guile scripts, usually
* "$prefix/share/gnucash/scm".
* "$prefix/share/guile/site/x.y".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_scmdir(void);
/** Returns the file path to the report directory, usually
* "$prefix/share/gnucash/scm/gnucash/report".
* "$prefix/share/guile/site/x.y/gnucash/report".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportdir(void);
/** Returns the file path to the reports, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports".
* "$prefix/share/guile/site/x.y/gnucash/reports".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_reportsdir(void);
/** Returns the file path to the standard
* reports, usually
* "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
* "$prefix/share/guile/site/x.y/gnucash/reports/standard".
*
* @returns A newly allocated string. */
gchar *gnc_path_get_stdreportsdir(void);