diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt index e1804feaab..5ce629451e 100644 --- a/gnucash/report/CMakeLists.txt +++ b/gnucash/report/CMakeLists.txt @@ -1,5 +1,4 @@ -add_subdirectory(business-reports) add_subdirectory(jqplot) add_subdirectory(locale-specific) add_subdirectory(report-gnome) @@ -9,5 +8,5 @@ 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} +set(report_DIST ${report_DIST_local} ${jqplot_DIST} ${locale_specific_DIST} ${report_gnome_DIST} ${report_system_DIST} ${reports_DIST} ${stylesheets_DIST} ${utility_reports_DIST} PARENT_SCOPE) diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt deleted file mode 100644 index 6cbd003c68..0000000000 --- a/gnucash/report/business-reports/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -set(business_reports_DATA - taxinvoice.eguile.scm - taxinvoice.css - receipt.eguile.scm - receipt.css - balsheet-eg.css - balsheet-eg.eguile.scm -) - -install(FILES ${business_reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report) - -set_local_dist(business_reports_DIST_local CMakeLists.txt - ${business_reports_DATA}) -set(business_reports_DIST ${business_reports_DIST_local} PARENT_SCOPE) diff --git a/gnucash/report/report-system/html-document.scm b/gnucash/report/report-system/html-document.scm index f7124f6bd7..b0c3da5774 100644 --- a/gnucash/report/report-system/html-document.scm +++ b/gnucash/report/report-system/html-document.scm @@ -146,9 +146,9 @@ (gnc:report-render-starting (gnc:html-document-title doc)) (when headers? ;;This is the only place where appears - ;;with the exception of 2 reports: - ;;./share/gnucash/scm/gnucash/report/taxinvoice.eguile.scm: - ;;./share/gnucash/scm/gnucash/report/balsheet-eg.eguile.scm: + ;;with the exception of 2 eguile report templates: + ;;./share/gnucash/scm/gnucash/report/reports/data/taxinvoice.eguile.scm: + ;;./share/gnucash/scm/gnucash/report/reports/data/balsheet-eg.eguile.scm: (push "\n") (push "\n") diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt index f4ad5ba73d..07083858c1 100644 --- a/gnucash/report/reports/CMakeLists.txt +++ b/gnucash/report/reports/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(standard/test) +add_subdirectory(data) set (reports_common_SCHEME aging.scm @@ -92,4 +93,4 @@ gnc_add_scheme_targets(scm-reports-standard add_custom_target(scm-reports ALL DEPENDS scm-reports-standard scm-reports-common scm-rpt-reports) set_local_dist(reports_DIST_local CMakeLists.txt ${reports_SCHEME} ${reports_common_SCHEME} ${reports_standard_SCHEME}) -set(reports_DIST ${reports_DIST_local} ${test_reports_standard_DIST} PARENT_SCOPE) +set(reports_DIST ${reports_DIST_local} ${reports_data_DIST} ${test_reports_standard_DIST} PARENT_SCOPE) diff --git a/gnucash/report/reports/data/CMakeLists.txt b/gnucash/report/reports/data/CMakeLists.txt new file mode 100644 index 0000000000..be294083d8 --- /dev/null +++ b/gnucash/report/reports/data/CMakeLists.txt @@ -0,0 +1,13 @@ +set(reports_DATA + taxinvoice.eguile.scm + taxinvoice.css + receipt.eguile.scm + receipt.css + balsheet-eg.css + balsheet-eg.eguile.scm +) + +install(FILES ${reports_DATA} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/gnucash/report) + +set_local_dist(reports_data_DIST_local CMakeLists.txt ${reports_DATA}) +set(reports_data_DIST ${reports_data_DIST_local} PARENT_SCOPE) diff --git a/gnucash/report/business-reports/balsheet-eg.css b/gnucash/report/reports/data/balsheet-eg.css similarity index 100% rename from gnucash/report/business-reports/balsheet-eg.css rename to gnucash/report/reports/data/balsheet-eg.css diff --git a/gnucash/report/business-reports/balsheet-eg.eguile.scm b/gnucash/report/reports/data/balsheet-eg.eguile.scm similarity index 100% rename from gnucash/report/business-reports/balsheet-eg.eguile.scm rename to gnucash/report/reports/data/balsheet-eg.eguile.scm diff --git a/gnucash/report/business-reports/receipt.css b/gnucash/report/reports/data/receipt.css similarity index 100% rename from gnucash/report/business-reports/receipt.css rename to gnucash/report/reports/data/receipt.css diff --git a/gnucash/report/business-reports/receipt.eguile.scm b/gnucash/report/reports/data/receipt.eguile.scm similarity index 100% rename from gnucash/report/business-reports/receipt.eguile.scm rename to gnucash/report/reports/data/receipt.eguile.scm diff --git a/gnucash/report/business-reports/taxinvoice.css b/gnucash/report/reports/data/taxinvoice.css similarity index 100% rename from gnucash/report/business-reports/taxinvoice.css rename to gnucash/report/reports/data/taxinvoice.css diff --git a/gnucash/report/business-reports/taxinvoice.eguile.scm b/gnucash/report/reports/data/taxinvoice.eguile.scm similarity index 100% rename from gnucash/report/business-reports/taxinvoice.eguile.scm rename to gnucash/report/reports/data/taxinvoice.eguile.scm diff --git a/po/POTFILES.in b/po/POTFILES.in index 78b7abf360..f89d7d8080 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -411,9 +411,6 @@ gnucash/register/register-gnome/gnucash-style.c gnucash/register/register-gnome/pricecell-gnome.c gnucash/register/register-gnome/quickfillcell-gnome.c gnucash/register/register-gnome/table-gnome.c -gnucash/report/business-reports/balsheet-eg.eguile.scm -gnucash/report/business-reports/receipt.eguile.scm -gnucash/report/business-reports/taxinvoice.eguile.scm gnucash/report/locale-specific/us/de_DE.scm gnucash/report/locale-specific/us/gncmod-locale-reports-us.c gnucash/report/locale-specific/us/taxtxf-de_DE.scm @@ -427,6 +424,9 @@ 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/aging.scm +gnucash/report/reports/data/balsheet-eg.eguile.scm +gnucash/report/reports/data/receipt.eguile.scm +gnucash/report/reports/data/taxinvoice.eguile.scm gnucash/report/reports/reports.scm gnucash/report/reports/standard/account-piecharts.scm gnucash/report/reports/standard/account-summary.scm