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

Bug 797572 - part 2 - swap Debits/Credits, can show informal headers

Browse Source 
Previously Credits was rendered before Debits. Change to formal
accounting convention. Can swap to informal headers if set by global
preference.
This commit is contained in:
Christopher Lam 2020-01-15 14:51:35 +08:00
parent 1dac9e1fc2
commit 8618c25d50
1 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
gnucash/report/business-reports/new-owner-report.scm
View File

@ -36,6 +36,7 @@
(use-modules (gnucash gnc-module))
(use-modules (gnucash utilities)) ; for gnc:debug
(use-modules (gnucash gettext))
(use-modules (sw_core_utils)) ; for gnc-prefs-get-bool
(gnc:module-load "gnucash/report/report-system" 0)
(use-modules (gnucash report standard-reports))
@ -56,7 +57,7 @@
(define tax-header (N_ "Tax"))
(define credit-header (N_ "Credits"))
(define debit-header (N_ "Debits"))
(define amount-header (N_ "Balance"))
(define balance-header (N_ "Balance"))
(define linked-txns-header (N_ "Links"))
;; Depending on the report type we want to set up some lists/cases
@ -125,9 +126,9 @@
(vector-ref columns-used 5))
(define (tax-col columns-used)
(vector-ref columns-used 6))
(define (credit-col columns-used)
(vector-ref columns-used 7))
(define (debit-col columns-used)
(vector-ref columns-used 7))
(define (credit-col columns-used)
(vector-ref columns-used 8))
(define (bal-col columns-used)
(vector-ref columns-used 9))
@ -179,13 +180,15 @@
(set-col (opt-val "Display Columns" desc-header) 4)
(set-col (opt-val "Display Columns" sale-header) 5)
(set-col (opt-val "Display Columns" tax-header) 6)
(set-col (opt-val "Display Columns" credit-header) 7)
(set-col (opt-val "Display Columns" debit-header) 8)
(set-col (opt-val "Display Columns" amount-header) 9)
(set-col (opt-val "Display Columns" debit-header) 7)
(set-col (opt-val "Display Columns" credit-header) 8)
(set-col (opt-val "Display Columns" balance-header) 9)
col-vector))
(define (make-heading-list column-vector link-option)
(let ((heading-list '()))
(define (make-heading-list column-vector link-option acct-type)
(let ((heading-list '())
(formal? (gnc-prefs-get-bool GNC-PREFS-GROUP-GENERAL
GNC-PREF-ACCOUNTING-LABELS)))
(if (date-col column-vector)
(addto! heading-list (_ date-header)))
(if (date-due-col column-vector)
@ -200,12 +203,14 @@
(addto! heading-list (_ sale-header)))
(if (tax-col column-vector)
(addto! heading-list (_ tax-header)))
(if (credit-col column-vector)
(addto! heading-list (_ credit-header)))
(if (debit-col column-vector)
(addto! heading-list (_ debit-header)))
(addto! heading-list
(if formal? debit-header (gnc:get-debit-string acct-type))))
(if (credit-col column-vector)
(addto! heading-list
(if formal? credit-header (gnc:get-credit-string acct-type))))
(if (bal-col column-vector)
(addto! heading-list (_ amount-header)))
(addto! heading-list (_ balance-header)))
(case link-option
((simple)
(addto! heading-list (_ linked-txns-header)))
@ -402,8 +407,8 @@
(append
(addif (sale-col column-vector) (cell sale))
(addif (tax-col column-vector) (cell tax))
(addif (credit-col column-vector) (cell-anchor credit))
(addif (debit-col column-vector) (cell-anchor (and debit (- debit))))
(addif (debit-col column-vector) (cell-anchor debit))
(addif (credit-col column-vector) (cell-anchor (and credit (- credit))))
(addif (bal-col column-vector) (cell amt))))
(addif (< 0 mid-span) cell-nohoriz)
(link-data->cols (car link-rows))))
@ -442,9 +447,9 @@
1 (1- period-span) #f))
(addif (sale-col used-columns) (make-cell sale))
(addif (tax-col used-columns) (make-cell tax))
(addif (debit-col used-columns) (make-cell debit))
(addif (credit-col used-columns) (make-cell credit))
(addif (debit-col used-columns) (make-cell (- debit)))
(addif (bal-col used-columns) (make-cell (+ credit debit)))
(addif (bal-col used-columns) (make-cell total))
(addif (< 0 rhs-cols) (gnc:make-html-table-cell/size
1 (+ mid-span rhs-cols) #f)))))
@ -710,7 +715,8 @@
(let* ((split (car splits))
(txn (xaccSplitGetParent split))
(date (xaccTransGetDate txn))
(value (AP-negate (xaccTransGetAccountAmount txn acc)))
(orig-value (xaccTransGetAccountAmount txn acc))
(value (AP-negate orig-value))
(invoice (gncInvoiceGetInvoiceFromTxn txn)))
(cond
@ -736,7 +742,8 @@
((txn-is-invoice? txn) (list split))
((txn-is-payment? txn) (txn->assetliab-splits txn))))
currency (+ total value)
(and (>= value 0) value) (and (< value 0) value)
(and (< orig-value 0) orig-value)
(and (>= orig-value 0) orig-value)
(invoice->sale invoice) (invoice->tax invoice)
(txn->transfer-split txn)
link-option
@ -754,8 +761,8 @@
(else '(()))))
(lp printed? (not odd-row?) (cdr splits) (+ total value)
(if (negative? value) (+ debit value) debit)
(if (negative? value) credit (+ credit value))
(if (< 0 orig-value) (+ debit orig-value) debit)
(if (< 0 orig-value) credit (- credit orig-value))
(+ tax (or (invoice->tax invoice) 0))
(+ sale (or (invoice->sale invoice) 0))))))))))
@ -816,20 +823,20 @@
(N_ "Display Columns") tax-header
"hab" (N_ "Display the tax column?") #f))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") credit-header
"hac" (N_ "Display the period credits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") debit-header
"had" (N_ "Display a period debits column?") #t))
"hac" (N_ "Display the period debits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") amount-header
"hb" (N_ "Display the transaction amount?") #t))
(N_ "Display Columns") credit-header
"had" (N_ "Display a period credits column?") #t))
(gnc:register-inv-option
(gnc:make-simple-boolean-option
(N_ "Display Columns") balance-header
"hb" (N_ "Display a running balance?") #t))
(gnc:register-inv-option
(gnc:make-multichoice-option
@ -951,7 +958,12 @@ invoices and amounts.")))))
(document (gnc:make-html-document))
(table (gnc:make-html-table))
(section-headings (make-section-heading-list used-columns owner-descr))
(headings (make-heading-list used-columns link-option))
(headings (make-heading-list
used-columns link-option
(if (eqv? (gncOwnerGetType (gncOwnerGetEndOwner owner))
GNC-OWNER-CUSTOMER)
ACCT-TYPE-RECEIVABLE
ACCT-TYPE-PAYABLE)))
(report-title (string-append (_ owner-descr) " " (_ "Report"))))
(cond