bindings - make business-core scm module part of the engine module

There's no reason to expose it as an individual module as what it exports
are support functions for first class engine objects.

bindings/guile/CMakeLists.txt

@@ -90,6 +90,7 @@ set (engine_SCHEME_0
     commodity-table.scm
     engine-utilities.scm
     gnc-numeric.scm
+    business-core.scm
 )
 
 set (engine_SCHEME_1
@@ -97,7 +98,6 @@ set (engine_SCHEME_1
 )
 
 set (engine_SCHEME_2
-    business-core.scm
     utilities.scm
 )
 

bindings/guile/business-core.scm

@@ -17,9 +17,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash business-core))
 (use-modules (srfi srfi-1))
-(use-modules (gnucash engine))
 
 (define (gnc:owner-get-address owner)
   (let ((type (gncOwnerGetType owner)))
@@ -116,11 +114,3 @@
     (cond (owner (gncOwnerCopy (gncOwnerGetEndOwner owner) result-owner)
                  result-owner)
           (else  '()))))
-
-
-(export gnc:owner-get-address)
-(export gnc:owner-get-name-dep)
-(export gnc:owner-get-address-dep)
-(export gnc:owner-get-name-and-address-dep)
-(export gnc:owner-get-owner-id)
-(export gnc:owner-from-split)

bindings/guile/engine.scm

@@ -70,6 +70,15 @@
 (export account-full-name<?)
 (export accounts-get-children-depth)
 
+; business-core.scm
+(export gnc:owner-get-address)
+(export gnc:owner-get-name-dep)
+(export gnc:owner-get-address-dep)
+(export gnc:owner-get-name-and-address-dep)
+(export gnc:owner-get-owner-id)
+(export gnc:owner-from-split)
+
 (load-from-path "gnucash/engine/gnc-numeric")
 (load-from-path "gnucash/engine/commodity-table")
 (load-from-path "gnucash/engine/engine-utilities")
+(load-from-path "gnucash/engine/business-core")

gnucash/report/reports/aging.scm

@@ -26,7 +26,6 @@
 
 (define-module (gnucash reports aging))
 
-(use-modules (gnucash business-core))
 (use-modules (gnucash engine))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gnc-module))

gnucash/report/reports/standard/invoice.scm

@@ -25,7 +25,6 @@
 (define-module (gnucash reports standard invoice))
 
 (use-modules (gnucash engine))
-(use-modules (gnucash business-core))
 (use-modules (srfi srfi-1))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))

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

@@ -27,7 +27,6 @@
 (define-module (gnucash reports standard job-report))
 
 (use-modules (srfi srfi-1))
-(use-modules (gnucash business-core))
 (use-modules (gnucash engine))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash utilities))		; for gnc:debug

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

@@ -29,7 +29,6 @@
 
 (use-modules (srfi srfi-1))
 (use-modules (srfi srfi-8))
-(use-modules (gnucash business-core))
 (use-modules (gnucash engine))
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash utilities))        ; for gnc:debug

gnucash/report/reports/standard/receipt.scm

@@ -17,7 +17,6 @@
 (define-module (gnucash reports standard receipt))
 
 (use-modules (ice-9 local-eval))  ; for the-environment
-(use-modules (gnucash business-core))
 (use-modules (gnucash engine))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gettext))

gnucash/report/reports/standard/taxinvoice.scm

@@ -26,7 +26,6 @@
 
 (use-modules (ice-9 local-eval))  ; for the-environment
 (use-modules (gnucash engine))
-(use-modules (gnucash business-core))
 (use-modules (gnucash utilities))
 (use-modules (gnucash gettext))
 

libgnucash/engine/test/test-business-core.scm

@@ -5,7 +5,6 @@
 (use-modules (tests srfi64-extras))
 (use-modules (tests test-engine-extras))
 (use-modules (gnucash utilities))
-(use-modules (gnucash business-core))
 (use-modules (gnucash engine))
 
 (define (run-test)