IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

[customer-summary] remove unneeded sanity check for owner

Browse Source 
and all-accounts which will never be null? because it's made of
income-accounts and expense-accounts, and (null? income-accounts) has
already been handled by previous cond
This commit is contained in:
Christopher Lam 2019-06-24 21:58:52 +08:00
parent 0f5d3e2029
commit 7f19abaabd
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gnucash/report/business-reports/customer-summary.scm
View File

@ -383,43 +383,41 @@
;; Loop over all owners
(map
(lambda (owner)
(if
(and (gncOwnerIsValid owner)
(> (length all-accounts) 0))
;; Now create the line for one single owner
(let ((total-income (gnc-numeric-zero))
(total-expense (gnc-numeric-zero)))
;; Now create the line for one single owner
(let ((total-income (gnc-numeric-zero))
(total-expense (gnc-numeric-zero)))
(set! currency (xaccAccountGetCommodity (car all-accounts)))
(set! any-valid-owner? #t)
(set! currency (xaccAccountGetCommodity (car all-accounts)))
(set! any-valid-owner? #t)
;; Run one query on all income accounts
(query-owner-setup owner-query owner)
;; Run one query on all income accounts
(query-owner-setup owner-query owner)
(set! total-income
(query-split-value owner-query toplevel-income-query))
(if reverse?
(set! total-income (gnc-numeric-neg total-income)))
(set! total-income (query-split-value owner-query toplevel-income-query))
(if reverse?
(set! total-income (gnc-numeric-neg total-income)))
;; Clean up the query
(qof-query-clear owner-query)
;; Clean up the query
(qof-query-clear owner-query)
;; And run one query on all expense accounts
(query-owner-setup owner-query owner)
;; And run one query on all expense accounts
(query-owner-setup owner-query owner)
(set! total-expense
(query-split-value owner-query toplevel-expense-query))
(if reverse?
(set! total-expense (gnc-numeric-neg total-expense)))
(set! total-expense (query-split-value owner-query toplevel-expense-query))
(if reverse?
(set! total-expense (gnc-numeric-neg total-expense)))
;; Clean up the query
(qof-query-clear owner-query)
;; Clean up the query
(qof-query-clear owner-query)
;; We print the summary now
(let* ((profit (gnc-numeric-add-fixed total-income total-expense))
(markupfloat (markup-percent profit total-income)))
;; We print the summary now
(let* ((profit (gnc-numeric-add-fixed total-income total-expense))
(markupfloat (markup-percent profit total-income)))
;; Result of this customer
(list owner profit markupfloat total-income total-expense)))))
;; Result of this customer
(list owner profit markupfloat total-income total-expense))))
ownerlist)))
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;