diff --git a/ChangeLog b/ChangeLog index 1e67608f60..d9dfa6360d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ files to their own directory. Create a business-reports directory for the current and future business reports. + * Move to invoice report into business-reports (it _IS_ a business + report after all). Add a business-reports guile module, and get + it all to work. Fix the gnucash-build-env script to look in the + new directories. + 2002-06-16 Derek Atkins Integrate the tax table into the gncEntry object; change how taxes diff --git a/src/bin/overrides/gnucash-build-env.in b/src/bin/overrides/gnucash-build-env.in index 67326a3912..7804713434 100644 --- a/src/bin/overrides/gnucash-build-env.in +++ b/src/bin/overrides/gnucash-build-env.in @@ -61,8 +61,10 @@ eval `@-GNC_SRCDIR-@/src/gnc-test-env \ --gnc-module-dir ${top_builddir}/src/backend/postgres \ --gnc-module-dir ${top_builddir}/src/business/business-core \ --gnc-module-dir ${top_builddir}/src/business/business-core/file \ + --gnc-module-dir ${top_builddir}/src/business/dialog-tax-table \ --gnc-module-dir ${top_builddir}/src/business/business-ledger \ --gnc-module-dir ${top_builddir}/src/business/business-gnome \ + --guile-load-dir ${top_builddir}/src/business/business-reports \ --gnc-module-dir ${top_builddir}/src/import-export/qif-io-core \ --gnc-module-dir ${top_builddir}/src/import-export/qif-import \ --gnc-module-dir ${top_builddir}/src/import-export/binary-import \ diff --git a/src/business/business-gnome/business-gnome.scm b/src/business/business-gnome/business-gnome.scm index 7c8e15dcb8..79e2e5fd95 100644 --- a/src/business/business-gnome/business-gnome.scm +++ b/src/business/business-gnome/business-gnome.scm @@ -8,6 +8,8 @@ (gnc:module-load "gnucash/business-core-file" 0) (gnc:module-load "gnucash/dialog-tax-table" 0) +;;(use-modules (gnucash report business-reports)) + (define top-level "_Business") (define new-label "New") (define find-label "Find") diff --git a/src/business/business-gnome/businessmod-gnome.c b/src/business/business-gnome/businessmod-gnome.c index b022e89946..98d526ac32 100644 --- a/src/business/business-gnome/businessmod-gnome.c +++ b/src/business/business-gnome/businessmod-gnome.c @@ -57,12 +57,13 @@ libgncmod_business_gnome_LTX_gnc_module_init(int refcount) if (!gnc_module_load ("gnucash/report/report-gnome", 0)) { return FALSE; } - if (!gnc_module_load ("gnucash/report/standard-reports", 0)) { - return FALSE; - } + // if (!gnc_module_load ("gnucash/report/standard-reports", 0)) { + // return FALSE; + // } gh_eval_str("(use-modules (g-wrapped gw-business-gnome))"); gh_eval_str("(use-modules (gnucash business-gnome))"); + gh_eval_str("(use-modules (gnucash report business-reports))"); if (refcount == 0) { /* Register the Owner search type */ diff --git a/src/business/business-reports/.cvsignore b/src/business/business-reports/.cvsignore index 282522db03..dd7501593e 100644 --- a/src/business/business-reports/.cvsignore +++ b/src/business/business-reports/.cvsignore @@ -1,2 +1,5 @@ +.scm-links +gnucash +report Makefile Makefile.in diff --git a/src/business/business-reports/Makefile.am b/src/business/business-reports/Makefile.am index 9f71df3b19..f2207690b9 100644 --- a/src/business/business-reports/Makefile.am +++ b/src/business/business-reports/Makefile.am @@ -1,2 +1,18 @@ -EXTRA_DIST= \ - .cvsignore +.scm-links: + rm -f gnucash report + ln -sf . gnucash + ln -sf ${srcdir} report + touch .scm-links + +noinst_DATA = .scm-links + +gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report +gncscmmod_DATA = \ + business-reports.scm \ + invoice.scm + +EXTRA_DIST = \ + .cvsignore \ + ${gncscmmod_DATA} + +CLEANFILES = gnucash report .scm-links diff --git a/src/business/business-reports/business-reports.scm b/src/business/business-reports/business-reports.scm new file mode 100644 index 0000000000..23a0892729 --- /dev/null +++ b/src/business/business-reports/business-reports.scm @@ -0,0 +1,16 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; business-reports.scm +;; load the business report definitions +;; +;; Copyright (c) 2002 Derek Atkins +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(define-module (gnucash report business-reports)) +(use-modules (gnucash gnc-module)) +(gnc:module-load "gnucash/report/standard-reports" 0) + +(export gnc:invoice-report-create) + +(use-modules (gnucash report invoice)) + +(define gnc:invoice-report-create gnc:invoice-report-create-internal) diff --git a/src/report/standard-reports/invoice.scm b/src/business/business-reports/invoice.scm similarity index 100% rename from src/report/standard-reports/invoice.scm rename to src/business/business-reports/invoice.scm diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am index ebd4bc7f6c..7ee2ee84c2 100644 --- a/src/report/standard-reports/Makefile.am +++ b/src/report/standard-reports/Makefile.am @@ -25,7 +25,6 @@ gncscmmod_DATA = \ average-balance.scm \ balance-sheet.scm \ category-barchart.scm \ - invoice.scm \ net-barchart.scm \ payables.scm \ pnl.scm \ diff --git a/src/report/standard-reports/standard-reports.scm b/src/report/standard-reports/standard-reports.scm index a5d39c03a4..f3819f1176 100644 --- a/src/report/standard-reports/standard-reports.scm +++ b/src/report/standard-reports/standard-reports.scm @@ -8,7 +8,6 @@ (define-module (gnucash report standard-reports)) (export gnc:register-report-create) -(export gnc:invoice-report-create) (export gnc:payables-report-create) (export gnc:receivables-report-create) @@ -18,7 +17,6 @@ (use-modules (gnucash report average-balance)) (use-modules (gnucash report balance-sheet)) (use-modules (gnucash report category-barchart)) -(use-modules (gnucash report invoice)) (use-modules (gnucash report net-barchart)) (use-modules (gnucash report pnl)) (use-modules (gnucash report portfolio)) @@ -29,6 +27,5 @@ (use-modules (gnucash report transaction)) (define gnc:register-report-create gnc:register-report-create-internal) -(define gnc:invoice-report-create gnc:invoice-report-create-internal) (define gnc:payables-report-create gnc:payables-report-create-internal) (define gnc:receivables-report-create gnc:receivables-report-create-internal)