gnucash maint: [new-owner-report] job-reports reverse according to ownertype
Christopher Lam
clam at code.gnucash.org
Tue Nov 5 10:20:05 EST 2019
Updated via https://github.com/Gnucash/gnucash/commit/1a9825fe (commit)
from https://github.com/Gnucash/gnucash/commit/d0743cd0 (commit)
commit 1a9825febcaadbd17298a45d3d032f94e59ee6d7
Author: Christopher Lam <christopher.lck at gmail.com>
Date: Tue Nov 5 23:08:08 2019 +0800
[new-owner-report] job-reports reverse according to ownertype
Previously job-report assumed owner was customer and assumed use of
A/Receivable account.
This fix ensures the payable? boolean must be derived dynamically from
owner-type rather than from report-type. This commit will check
whether owner is vendor/employee and uses a/payable; otherwise uses
a/receivable.
diff --git a/gnucash/report/business-reports/new-owner-report.scm b/gnucash/report/business-reports/new-owner-report.scm
index d7cfa2589..549601f78 100644
--- a/gnucash/report/business-reports/new-owner-report.scm
+++ b/gnucash/report/business-reports/new-owner-report.scm
@@ -695,7 +695,7 @@ invoices and amounts.")))))
(gnc:make-html-text
(gnc:html-markup-br))))
-(define (reg-renderer report-obj type payable?)
+(define (reg-renderer report-obj type)
(define options (gnc:report-options report-obj))
(define (opt-val section name)
(gnc:option-value
@@ -719,6 +719,8 @@ invoices and amounts.")))))
(owner-descr (owner-string type))
(date-type (opt-val gnc:pagename-general optname-date-driver))
(owner (opt-val owner-page owner-descr))
+ (payable? (memv (gncOwnerGetType (gncOwnerGetEndOwner owner))
+ (list GNC-OWNER-VENDOR GNC-OWNER-EMPLOYEE)))
(query (qof-query-create-for-splits))
(document (gnc:make-html-document))
(table (gnc:make-html-table))
@@ -842,16 +844,16 @@ invoices and amounts.")))))
document))
(define (customer-renderer obj)
- (reg-renderer obj GNC-OWNER-CUSTOMER #f))
+ (reg-renderer obj GNC-OWNER-CUSTOMER))
(define (vendor-renderer obj)
- (reg-renderer obj GNC-OWNER-VENDOR #t))
+ (reg-renderer obj GNC-OWNER-VENDOR))
(define (employee-renderer obj)
- (reg-renderer obj GNC-OWNER-EMPLOYEE #t))
+ (reg-renderer obj GNC-OWNER-EMPLOYEE))
(define (job-renderer obj)
- (reg-renderer obj GNC-OWNER-JOB #f))
+ (reg-renderer obj GNC-OWNER-JOB))
(gnc:define-report
'version 1
Summary of changes:
gnucash/report/business-reports/new-owner-report.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
More information about the gnucash-changes
mailing list