* 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.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6968 57a11ea4-9604-0410-9ed3-97b8803252fd

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   <derek@ihtfp.com>
 
 	Integrate the tax table into the gncEntry object; change how taxes

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 \

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")

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)) {
+  //  if (!gnc_module_load ("gnucash/report/standard-reports", 0)) {
-    return FALSE;
+  //    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 */

src/business/business-reports/.cvsignore

@@ -1,2 +1,5 @@
+.scm-links
+gnucash
+report
 Makefile
 Makefile.in

src/business/business-reports/Makefile.am

@@ -1,2 +1,18 @@
-EXTRA_DIST= \
+.scm-links:
-  .cvsignore
+	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

src/business/business-reports/business-reports.scm

@@ -0,0 +1,16 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;  business-reports.scm
+;;  load the business report definitions
+;;
+;;  Copyright (c) 2002 Derek Atkins <derek@ihtfp.com>
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(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)

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 \

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)