Report fs cleanup - move standard reports to new location

The end goal of this cleanup is to have all reports grouped in
subdirectories of the new 'reports' directory.
This first commit moves the standard reports
which mostly involves renaming several modules and targets.

.gitignore

@@ -177,7 +177,7 @@ gnucash/report/report-gnome/gnucash
 gnucash/report/report-gnome/test/test-link-module
 gnucash/report/report-system/gnucash
 gnucash/report/report-system/test/test-link-module
-gnucash/report/standard-reports/gnucash
+gnucash/report/reports/gnucash
 gnucash/report/stylesheets/gnucash
 gnucash/report/utility-reports/gnucash
 swig-*.c

gnucash/report/CMakeLists.txt

@@ -4,10 +4,10 @@ add_subdirectory(jqplot)
 add_subdirectory(locale-specific)
 add_subdirectory(report-gnome)
 add_subdirectory(report-system)
-add_subdirectory(standard-reports)
+add_subdirectory(reports)
 add_subdirectory(stylesheets)
 add_subdirectory(utility-reports)
 
 set_local_dist(report_DIST_local CMakeLists.txt )
 set(report_DIST ${report_DIST_local} ${business_reports_DIST} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST}
-                ${standard_reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST}  PARENT_SCOPE)
+                ${reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST}  PARENT_SCOPE)

gnucash/report/business-reports/CMakeLists.txt

@@ -32,7 +32,7 @@ set(GUILE_DEPENDS
   scm-engine
   scm-scm
   scm-business-reports-links
-  scm-standard-reports
+  scm-reports
   scm-report-system
   )
 

gnucash/report/business-reports/aging.scm

@@ -32,7 +32,7 @@
 
 (gnc:module-load "gnucash/report/report-system" 0)
 
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (define optname-to-date (N_ "To"))

gnucash/report/business-reports/business-reports.scm

@@ -27,7 +27,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 
 ;; to define gnc-build-url
 (gnc:module-load "gnucash/html" 0)

gnucash/report/business-reports/customer-summary.scm

@@ -34,7 +34,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 ;; Option names

gnucash/report/business-reports/invoice.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash utilities))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (define (addif pred . data) (if pred data '()))

gnucash/report/business-reports/job-report.scm

@@ -32,7 +32,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (define acct-string (N_ "Account"))

gnucash/report/business-reports/owner-report.scm

@@ -33,7 +33,7 @@
 (use-modules (gnucash gettext))
 
 (gnc:module-load "gnucash/report/report-system" 0)
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 ;; Option names

gnucash/report/business-reports/payables.scm

@@ -32,7 +32,7 @@
 (gnc:module-load "gnucash/report/report-system" 0)
 
 (use-modules (gnucash report aging))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (define acc-page gnc:pagename-general)

gnucash/report/business-reports/receipt.scm

@@ -24,7 +24,7 @@
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (use-modules (gnucash report eguile-utilities))

gnucash/report/business-reports/receivables.scm

@@ -32,7 +32,7 @@
 (gnc:module-load "gnucash/report/report-system" 0)
 
 (use-modules (gnucash report aging))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (define acc-page gnc:pagename-general)

gnucash/report/business-reports/taxinvoice.scm

@@ -32,7 +32,7 @@
 (gnc:module-load "gnucash/html" 0)
 (gnc:module-load "gnucash/engine" 0)
 
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 
 (use-modules (gnucash report eguile-utilities))

gnucash/report/report-gnome/CMakeLists.txt

@@ -62,7 +62,7 @@ set(GUILE_DEPENDS
   scm-gnc-module
   scm-scm
   scm-report-system
-  scm-standard-reports
+  scm-reports
   scm-business-reports
   scm-utility-reports
   )

gnucash/report/report-gnome/gncmod-report-gnome.c

@@ -88,7 +88,7 @@ libgncmod_report_gnome_gnc_module_init(int refcount)
         return FALSE;
     }
 
-    lmod ("(gnucash report standard-reports)");
+    lmod ("(gnucash report reports)");
     lmod ("(gnucash report business-reports)");
     lmod ("(gnucash report utility-reports)");
 

gnucash/report/reports/CMakeLists.txt

@@ -0,0 +1,65 @@
+
+add_subdirectory(standard/test)
+
+set (reports_common_SCHEME reports.scm)
+
+set (reports_standard_SCHEME
+    standard/account-piecharts.scm
+    standard/account-summary.scm
+    standard/advanced-portfolio.scm
+    standard/average-balance.scm
+    standard/balance-sheet.scm
+    standard/balance-forecast.scm
+    standard/balsheet-pnl.scm
+    standard/budget-balance-sheet.scm
+    standard/budget-barchart.scm
+    standard/budget-flow.scm
+    standard/budget-income-statement.scm
+    standard/budget.scm
+    standard/cash-flow.scm
+    standard/cashflow-barchart.scm
+    standard/category-barchart.scm
+    standard/daily-reports.scm
+    standard/equity-statement.scm
+    standard/general-journal.scm
+    standard/general-ledger.scm
+    standard/income-gst-statement.scm
+    standard/income-statement.scm
+    standard/net-charts.scm
+    standard/portfolio.scm
+    standard/price-scatter.scm
+    standard/reconcile-report.scm
+    standard/register.scm
+    standard/sx-summary.scm
+    standard/transaction.scm
+    standard/trial-balance.scm
+    )
+
+set(GUILE_DEPENDS
+  gncmod-html
+  scm-core-utils
+  scm-engine
+  scm-gettext
+  scm-scm
+  scm-gnome-utils
+  scm-report-system
+  )
+
+gnc_add_scheme_targets(scm-reports-common
+  "${reports_common_SCHEME}"
+  "gnucash/report"
+  "scm-reports-standard;${GUILE_DEPENDS}"
+  TRUE
+)
+
+gnc_add_scheme_targets(scm-reports-standard
+  "${reports_standard_SCHEME}"
+  "gnucash/report/reports/standard"
+  "scm-reports-standard-links;${GUILE_DEPENDS}"
+  TRUE
+)
+
+add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-common)
+
+set_local_dist(reports_DIST_local CMakeLists.txt ${reports_common_SCHEME} ${reports_standard_SCHEME})
+set(reports_DIST ${reports_DIST_local} ${test_reports_standard_DIST} PARENT_SCOPE)

gnucash/report/reports/reports.scm

@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  standard-reports.scm
+;;  reports.scm
 ;;  load the standard report definitions
 ;;
 ;;  Copyright (c) 2001 Linux Developers Group, Inc. 
@@ -24,7 +24,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
-(define-module (gnucash report standard-reports))
+(define-module (gnucash report reports))
 (use-modules (srfi srfi-13))
 (use-modules (gnucash utilities))
 (use-modules (gnucash core-utils))
@@ -120,7 +120,7 @@
  (lambda (x)
    (module-use!
     (current-module)
-    (resolve-interface `(gnucash report standard-reports ,x))))
+    (resolve-interface `(gnucash report reports standard ,x))))
  (get-report-list))
 
 (use-modules (gnucash gnc-module))

gnucash/report/reports/standard/account-piecharts.scm

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

gnucash/report/reports/standard/account-summary.scm

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

gnucash/report/reports/standard/advanced-portfolio.scm

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

gnucash/report/reports/standard/average-balance.scm

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

gnucash/report/reports/standard/balance-forecast.scm

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

gnucash/report/reports/standard/balance-sheet.scm

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

gnucash/report/reports/standard/balsheet-pnl.scm

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

gnucash/report/reports/standard/budget-balance-sheet.scm

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

gnucash/report/reports/standard/budget-barchart.scm

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

gnucash/report/reports/standard/budget-flow.scm

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

gnucash/report/reports/standard/budget-income-statement.scm

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

gnucash/report/reports/standard/budget.scm

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

gnucash/report/reports/standard/cash-flow.scm

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

gnucash/report/reports/standard/cashflow-barchart.scm

@@ -27,13 +27,13 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report standard-reports cashflow-barchart))
+(define-module (gnucash report 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 standard-reports cash-flow))
+(use-modules (gnucash report reports standard cash-flow))
 
 (gnc:module-load "gnucash/report/report-system" 0)
 

gnucash/report/reports/standard/category-barchart.scm

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

gnucash/report/reports/standard/daily-reports.scm

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

gnucash/report/reports/standard/equity-statement.scm

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

gnucash/report/reports/standard/general-journal.scm

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

gnucash/report/reports/standard/general-ledger.scm

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

gnucash/report/reports/standard/income-gst-statement.scm

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

gnucash/report/reports/standard/income-statement.scm

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

gnucash/report/reports/standard/net-charts.scm

@@ -26,14 +26,14 @@
 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report standard-reports net-charts))
+(define-module (gnucash report reports standard net-charts))
 
 (use-modules (srfi srfi-1))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
 
-(use-modules (gnucash report standard-reports category-barchart)) ; for guids of called reports
+(use-modules (gnucash report reports standard category-barchart)) ; for guids of called reports
 (gnc:module-load "gnucash/report/report-system" 0)
 
 

gnucash/report/reports/standard/portfolio.scm

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

gnucash/report/reports/standard/price-scatter.scm

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

gnucash/report/reports/standard/reconcile-report.scm

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

gnucash/report/reports/standard/register.scm

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

gnucash/report/reports/standard/sx-summary.scm

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

gnucash/report/reports/standard/test/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(scm_test_standard_reports_SOURCES
+set(scm_test_reports_standard_SOURCES
   test-cash-flow.scm
 )
 
@@ -28,7 +28,7 @@ set(GUILE_DEPENDS
   scm-gettext
   scm-scm
   scm-test-report-system
-  scm-standard-reports
+  scm-reports
   scm-report-stylesheets
   )
 
@@ -39,18 +39,18 @@ if (HAVE_SRFI64)
   endif (HAVE_TEXT_PORTS)
 endif (HAVE_SRFI64)
 
-gnc_add_scheme_tests("${scm_test_standard_reports_SOURCES}")
+gnc_add_scheme_tests("${scm_test_reports_standard_SOURCES}")
 
-gnc_add_scheme_targets(scm-test-standard-reports
-  "${scm_test_standard_reports_SOURCES}"
-  gnucash/report/standard-reports/test
+gnc_add_scheme_targets(scm-test-reports-standard
+  "${scm_test_reports_standard_SOURCES}"
+  gnucash/report/reports/standard/test
   "${GUILE_DEPENDS}"
   FALSE
 )
 
-add_dependencies(check scm-test-standard-reports)
+add_dependencies(check scm-test-reports-standard)
 
-set_dist_list(test_standard_reports_DIST CMakeLists.txt
+set_dist_list(test_reports_standard_DIST CMakeLists.txt
   ${scm_test_with_srfi64_SOURCES}
   ${scm_test_with_textual_ports_SOURCES}
-  ${scm_test_standard_reports_SOURCES})
+  ${scm_test_reports_standard_SOURCES})

gnucash/report/reports/standard/test/test-average-balance.scm

@@ -2,9 +2,9 @@
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports average-balance))
+(use-modules (gnucash report reports standard average-balance))
 (use-modules (gnucash report report-system))
-(use-modules (gnucash report standard-reports budget))
+(use-modules (gnucash report reports standard budget))
 (use-modules (gnucash report report-system test test-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash engine test srfi64-extras))

gnucash/report/reports/standard/test/test-balsheet-pnl.scm

@@ -1,8 +1,8 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports balance-sheet))
-(use-modules (gnucash report standard-reports income-statement))
+(use-modules (gnucash report reports standard balance-sheet))
+(use-modules (gnucash report reports standard income-statement))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report report-system test test-extras))

gnucash/report/reports/standard/test/test-budget.scm

@@ -30,7 +30,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report standard-reports budget))
+(use-modules (gnucash report reports standard budget))
 (use-modules (gnucash report report-system test test-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash engine test test-extras))

gnucash/report/reports/standard/test/test-cash-flow.scm

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

gnucash/report/reports/standard/test/test-cashflow-barchart.scm

@@ -28,7 +28,7 @@
 (use-modules (gnucash engine test srfi64-extras))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports cashflow-barchart))
+(use-modules (gnucash report reports standard cashflow-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-64))

gnucash/report/reports/standard/test/test-charts.scm

@@ -1,11 +1,11 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports net-charts))
-(use-modules (gnucash report standard-reports account-piecharts))
-(use-modules (gnucash report standard-reports cashflow-barchart))
-(use-modules (gnucash report standard-reports daily-reports))
-(use-modules (gnucash report standard-reports price-scatter))
+(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 daily-reports))
+(use-modules (gnucash report reports standard price-scatter))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report report-system test test-extras))

gnucash/report/reports/standard/test/test-income-gst.scm

@@ -1,7 +1,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports income-gst-statement))
+(use-modules (gnucash report reports standard income-gst-statement))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report report-system test test-extras))

gnucash/report/reports/standard/test/test-register.scm

@@ -35,7 +35,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report standard-reports register))
+(use-modules (gnucash report reports standard register))
 (use-modules (gnucash report report-system test test-extras))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash engine test test-extras))

gnucash/report/reports/standard/test/test-standard-category-report.scm

@@ -35,9 +35,9 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash engine))
 (use-modules (sw_engine))
-(use-modules (gnucash report standard-reports net-charts))
+(use-modules (gnucash report reports standard net-charts))
 (use-modules (gnucash report report-system test test-extras))
-(use-modules (gnucash report standard-reports category-barchart))
+(use-modules (gnucash report reports standard category-barchart))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash engine test test-extras))
 (use-modules (gnucash report report-system test test-extras))

gnucash/report/reports/standard/test/test-standard-net-barchart.scm

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

gnucash/report/reports/standard/test/test-standard-net-linechart.scm

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

gnucash/report/reports/standard/test/test-stress-options.scm

@@ -4,7 +4,7 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports))
+(use-modules (gnucash report reports))
 (use-modules (gnucash report business-reports))
 (use-modules (gnucash report view-column))
 (use-modules (gnucash report stylesheets))

gnucash/report/reports/standard/test/test-transaction.scm

@@ -1,8 +1,8 @@
 (use-modules (gnucash gnc-module))
 (gnc:module-begin-syntax (gnc:module-load "gnucash/app-utils" 0))
 (use-modules (gnucash engine test test-extras))
-(use-modules (gnucash report standard-reports transaction))
-(use-modules (gnucash report standard-reports reconcile-report))
+(use-modules (gnucash report reports standard transaction))
+(use-modules (gnucash report reports standard reconcile-report))
 (use-modules (gnucash report stylesheets))
 (use-modules (gnucash report report-system))
 (use-modules (gnucash report report-system test test-extras))

gnucash/report/reports/standard/transaction.scm

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

gnucash/report/reports/standard/trial-balance.scm

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

gnucash/report/standard-reports/CMakeLists.txt

@@ -1,65 +0,0 @@
-
-add_subdirectory(test)
-
-set (standard_reports_SCHEME standard-reports.scm)
-
-set (standard_reports_SCHEME_2
-    account-piecharts.scm
-    account-summary.scm
-    advanced-portfolio.scm
-    average-balance.scm
-    balance-sheet.scm
-    balance-forecast.scm
-    balsheet-pnl.scm
-    budget-balance-sheet.scm
-    budget-barchart.scm
-    budget-flow.scm
-    budget-income-statement.scm
-    budget.scm
-    cash-flow.scm
-    cashflow-barchart.scm
-    category-barchart.scm
-    daily-reports.scm
-    equity-statement.scm
-    general-journal.scm
-    general-ledger.scm
-    income-gst-statement.scm
-    income-statement.scm
-    net-charts.scm
-    portfolio.scm
-    price-scatter.scm
-    reconcile-report.scm
-    register.scm
-    sx-summary.scm
-    transaction.scm
-    trial-balance.scm
-    )
-
-set(GUILE_DEPENDS
-  gncmod-html
-  scm-core-utils
-  scm-engine
-  scm-gettext
-  scm-scm
-  scm-gnome-utils
-  scm-report-system
-  )
-
-gnc_add_scheme_targets(scm-standard-reports-1
-  "${standard_reports_SCHEME}"
-  "gnucash/report"
-  "scm-standard-reports-2;${GUILE_DEPENDS}"
-  TRUE
-)
-
-gnc_add_scheme_targets(scm-standard-reports-2
-  "${standard_reports_SCHEME_2}"
-  "gnucash/report/standard-reports"
-  "scm-standard-reports-2-links;${GUILE_DEPENDS}"
-  TRUE
-)
-
-add_custom_target(scm-standard-reports ALL DEPENDS scm-standard-reports-2 scm-standard-reports-1)
-
-set_local_dist(standard_reports_DIST_local CMakeLists.txt ${standard_reports_SCHEME} ${standard_reports_SCHEME_2})
-set(standard_reports_DIST ${standard_reports_DIST_local} ${test_standard_reports_DIST} PARENT_SCOPE)

gnucash/report/utility-reports/utility-reports.scm

@@ -1,6 +1,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;  standard-reports.scm
-;;  load the standard report definitions
+;;  utility-reports.scm
+;;  load the utility report definitions
 ;;
 ;;  Copyright (c) 2001 Linux Developers Group, Inc. 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

libgnucash/core-utils/gnc-path.c

@@ -196,13 +196,13 @@ gchar *gnc_path_get_reportdir()
 
 /** Returns the file path to the standard
  * reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_stdreportsdir()
 {
     gchar *reportdir = gnc_path_get_reportdir ();
-    gchar *result = g_build_filename (reportdir, "standard-reports", NULL);
+    gchar *result = g_build_filename (reportdir, "reports", "standard", NULL);
     g_free (reportdir);
     //printf("Returning stdreportsdir %s\n", result);
     return result;

libgnucash/core-utils/gnc-path.h

@@ -100,7 +100,7 @@ gchar *gnc_path_get_reportdir(void);
 
 /** Returns the file path to the standard
  * reports, usually
- * "$prefix/share/gnucash/scm/gnucash/report/standard-reports".
+ * "$prefix/share/gnucash/scm/gnucash/report/reports/standard".
  *
  * @returns A newly allocated string. */
 gchar *gnc_path_get_stdreportsdir(void);

libgnucash/doc/user-prefs-howto.txt

@@ -48,7 +48,7 @@ cache_pin =
 The third argument here is the default value in case the lookup
 fails. The C function prototypes for lookup of other options can be found in
 src/app-utils/global-options.h.  A lookup of a global preference in
-Scheme can be seen e.g. in src/report/standard-reports/register.scm
+Scheme can be seen e.g. in src/report/reports/standard/register.scm
 line 556:
 
 \verbatim

po/POTFILES.in

@@ -437,6 +437,36 @@ gnucash/report/report-gnome/gncmod-report-gnome.c
 gnucash/report/report-gnome/gnc-plugin-page-report.c
 gnucash/report/report-gnome/report-gnome.scm
 gnucash/report/report-gnome/window-report.c
+gnucash/report/reports/reports.scm
+gnucash/report/reports/standard/account-piecharts.scm
+gnucash/report/reports/standard/account-summary.scm
+gnucash/report/reports/standard/advanced-portfolio.scm
+gnucash/report/reports/standard/average-balance.scm
+gnucash/report/reports/standard/balance-forecast.scm
+gnucash/report/reports/standard/balance-sheet.scm
+gnucash/report/reports/standard/balsheet-pnl.scm
+gnucash/report/reports/standard/budget-balance-sheet.scm
+gnucash/report/reports/standard/budget-barchart.scm
+gnucash/report/reports/standard/budget-flow.scm
+gnucash/report/reports/standard/budget-income-statement.scm
+gnucash/report/reports/standard/budget.scm
+gnucash/report/reports/standard/cashflow-barchart.scm
+gnucash/report/reports/standard/cash-flow.scm
+gnucash/report/reports/standard/category-barchart.scm
+gnucash/report/reports/standard/daily-reports.scm
+gnucash/report/reports/standard/equity-statement.scm
+gnucash/report/reports/standard/general-journal.scm
+gnucash/report/reports/standard/general-ledger.scm
+gnucash/report/reports/standard/income-gst-statement.scm
+gnucash/report/reports/standard/income-statement.scm
+gnucash/report/reports/standard/net-charts.scm
+gnucash/report/reports/standard/portfolio.scm
+gnucash/report/reports/standard/price-scatter.scm
+gnucash/report/reports/standard/reconcile-report.scm
+gnucash/report/reports/standard/register.scm
+gnucash/report/reports/standard/sx-summary.scm
+gnucash/report/reports/standard/transaction.scm
+gnucash/report/reports/standard/trial-balance.scm
 gnucash/report/report-system/collectors.scm
 gnucash/report/report-system/commodity-utilities.scm
 gnucash/report/report-system/eguile-gnc.scm
@@ -463,36 +493,6 @@ gnucash/report/report-system/report.scm
 gnucash/report/report-system/report-system.scm
 gnucash/report/report-system/report-utilities.scm
 gnucash/report/report-system/trep-engine.scm
-gnucash/report/standard-reports/account-piecharts.scm
-gnucash/report/standard-reports/account-summary.scm
-gnucash/report/standard-reports/advanced-portfolio.scm
-gnucash/report/standard-reports/average-balance.scm
-gnucash/report/standard-reports/balance-forecast.scm
-gnucash/report/standard-reports/balance-sheet.scm
-gnucash/report/standard-reports/balsheet-pnl.scm
-gnucash/report/standard-reports/budget-balance-sheet.scm
-gnucash/report/standard-reports/budget-barchart.scm
-gnucash/report/standard-reports/budget-flow.scm
-gnucash/report/standard-reports/budget-income-statement.scm
-gnucash/report/standard-reports/budget.scm
-gnucash/report/standard-reports/cashflow-barchart.scm
-gnucash/report/standard-reports/cash-flow.scm
-gnucash/report/standard-reports/category-barchart.scm
-gnucash/report/standard-reports/daily-reports.scm
-gnucash/report/standard-reports/equity-statement.scm
-gnucash/report/standard-reports/general-journal.scm
-gnucash/report/standard-reports/general-ledger.scm
-gnucash/report/standard-reports/income-gst-statement.scm
-gnucash/report/standard-reports/income-statement.scm
-gnucash/report/standard-reports/net-charts.scm
-gnucash/report/standard-reports/portfolio.scm
-gnucash/report/standard-reports/price-scatter.scm
-gnucash/report/standard-reports/reconcile-report.scm
-gnucash/report/standard-reports/register.scm
-gnucash/report/standard-reports/standard-reports.scm
-gnucash/report/standard-reports/sx-summary.scm
-gnucash/report/standard-reports/transaction.scm
-gnucash/report/standard-reports/trial-balance.scm
 gnucash/report/stylesheets/gncmod-stylesheets.c
 gnucash/report/stylesheets/gnc-plugin-stylesheets.c
 gnucash/report/stylesheets/stylesheet-easy.scm