diff --git a/ChangeLog b/ChangeLog index 71cb214fcc..a96e5d779b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-02-12 Derek Atkins + + * src/business/*/*.scm: + rename gnc:owner-get-address-dep to + gnc:owner-get-name-and-address-dep in preparation of + some other patches. + 2006-02-11 Derek Atkins * src/report/report-gnome/gnc-plugin-page-report.c: diff --git a/src/business/business-core/business-core.scm b/src/business/business-core/business-core.scm index ea914f4951..aa2010bcc2 100644 --- a/src/business/business-core/business-core.scm +++ b/src/business/business-core/business-core.scm @@ -53,7 +53,7 @@ (gnc:owner-get-job owner)))) (else "")))) -(define (gnc:owner-get-address-dep owner) +(define (gnc:owner-get-name-and-address-dep owner) (let ((type (gw:enum--val->sym (gnc:owner-get-type owner) #f))) (case type @@ -73,7 +73,7 @@ "" (gnc:employee-get-addr e)))) ((gnc-owner-job) - (gnc:owner-get-address-dep (gnc:job-get-owner + (gnc:owner-get-name-and-address-dep (gnc:job-get-owner (gnc:owner-get-job owner)))) (else "")))) @@ -134,7 +134,7 @@ (export gnc:owner-get-address) -(export gnc:owner-get-address-dep) +(export gnc:owner-get-name-and-address-dep) (export gnc:owner-get-owner-id) (export gnc:entry-type-percent-p) (export gnc:owner-from-split) diff --git a/src/business/business-reports/easy-invoice.scm b/src/business/business-reports/easy-invoice.scm index 9ccd6eb76a..9a3ef33d9e 100644 --- a/src/business/business-reports/easy-invoice.scm +++ b/src/business/business-reports/easy-invoice.scm @@ -584,7 +584,7 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table (list "
")) diff --git a/src/business/business-reports/fancy-invoice.scm b/src/business/business-reports/fancy-invoice.scm index 3871485fa9..26ffa3abd8 100644 --- a/src/business/business-reports/fancy-invoice.scm +++ b/src/business/business-reports/fancy-invoice.scm @@ -576,7 +576,7 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table (list "
")) diff --git a/src/business/business-reports/invoice.scm b/src/business/business-reports/invoice.scm index 8a02a5efee..12cdeb15ee 100644 --- a/src/business/business-reports/invoice.scm +++ b/src/business/business-reports/invoice.scm @@ -549,7 +549,7 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table (list "
")) diff --git a/src/business/business-reports/owner-report.scm b/src/business/business-reports/owner-report.scm index f0e42d5140..46b9334a65 100644 --- a/src/business/business-reports/owner-report.scm +++ b/src/business/business-reports/owner-report.scm @@ -462,7 +462,7 @@ (gnc:html-table-append-row! table (list - (string-expand (gnc:owner-get-address-dep owner) #\newline "
"))) + (string-expand (gnc:owner-get-name-and-address-dep owner) #\newline "
"))) (gnc:html-table-append-row! table (list "
"))