mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge branch 'unstable-tr-fix' of https://github.com/christopherlam/gnucash into unstable
This commit is contained in:
Geert Janssens
commit
a39ba1672a
@ -68,7 +68,7 @@
|
||||
))))
|
||||
(set! font-family font-name)
|
||||
(set! result (string-append
|
||||
"font-family: " font-family "; "
|
||||
"font-family: " font-family ", Sans-Serif; "
|
||||
"font-size: " font-size "pt; "
|
||||
(if font-style (string-append "font-style: " font-style "; ") "")
|
||||
(if font-weight (string-append "font-weight: " font-weight "; ") "")))
|
||||
|
||||
@ -43,14 +43,15 @@
|
||||
authorities. From <i>Edit report options</i> above, choose your Business Income and Business Expense accounts.
|
||||
Each transaction may contain, in addition to the accounts payable/receivable or bank accounts,
|
||||
a split to a tax account, e.g. Income:Sales -$1000, Liability:GST on Sales -$100, Asset:Bank $1100.")
|
||||
"<br><br>"
|
||||
"<br/><br/>"
|
||||
(_ "These tax accounts can either be populated using the standard register, or from Business Invoices and Bills
|
||||
which will require Business > Sales Tax Tables to be set up correctly. Please see the documentation.")
|
||||
"<br><br>"
|
||||
"<br/><br/>"
|
||||
(_ "From the Report Options, you will need to select the accounts which will \
|
||||
hold the GST/VAT taxes collected or paid. These accounts must contain splits which document the \
|
||||
monies which are wholly sent or claimed from tax authorities during periodic GST/VAT returns. These \
|
||||
accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")))
|
||||
accounts must be of type ASSET for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
|
||||
"<br/><br/>"))
|
||||
|
||||
(define (income-gst-statement-renderer rpt)
|
||||
(trep-renderer rpt
|
||||
@ -216,7 +217,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
|
||||
(lambda (a) ""))))
|
||||
(if (opt-val gnc:pagename-display (N_ "Individual tax columns"))
|
||||
(map (lambda (acc) (vector (xaccAccountGetName acc)
|
||||
(account-adder acc)
|
||||
(account-adder-neg acc)
|
||||
#t #t #f
|
||||
(lambda (a) "")))
|
||||
accounts-tax-collected)
|
||||
|
||||
@ -321,6 +321,10 @@ in the Options panel."))
|
||||
(cons 'tip (_ "Show both (and include void transactions in totals)."))))))
|
||||
|
||||
(define reconcile-status-list
|
||||
;; 'filter-types must be either #f (i.e. disable reconcile filter)
|
||||
;; or a value defined as defined in Query.c
|
||||
;; e.g. CLEARED-NO for unreconciled
|
||||
;; (logior CLEARED-NO CLEARED-CLEARED) for unreconciled & cleared
|
||||
(list
|
||||
(cons 'all
|
||||
(list
|
||||
@ -332,19 +336,19 @@ in the Options panel."))
|
||||
(list
|
||||
(cons 'text (_ "Unreconciled"))
|
||||
(cons 'tip (_ "Unreconciled only"))
|
||||
(cons 'filter-types (list #\n))))
|
||||
(cons 'filter-types CLEARED-NO)))
|
||||
|
||||
(cons 'cleared
|
||||
(list
|
||||
(cons 'text (_ "Cleared"))
|
||||
(cons 'tip (_ "Cleared only"))
|
||||
(cons 'filter-types (list #\c))))
|
||||
(cons 'filter-types CLEARED-CLEARED)))
|
||||
|
||||
(cons 'reconciled
|
||||
(list
|
||||
(cons 'text (_ "Reconciled"))
|
||||
(cons 'tip (_ "Reconciled only"))
|
||||
(cons 'filter-types (list #\y))))))
|
||||
(cons 'filter-types CLEARED-RECONCILED)))))
|
||||
|
||||
|
||||
(define ascending-list
|
||||
@ -1290,52 +1294,38 @@ tags within description, notes or memo. ")
|
||||
(addto! row-contents (gnc:make-html-table-cell/size/markup 1 (+ right-indent width-left-columns) "total-label-cell" string))))
|
||||
|
||||
(define (add-columns commodity)
|
||||
(let ((start-dual-column? #f)
|
||||
(dual-subtotal #f))
|
||||
(for-each (lambda (column merge-entry)
|
||||
(let* ((mon (retrieve-commodity column commodity))
|
||||
(column-amount (and mon (gnc:gnc-monetary-amount mon)))
|
||||
(merge? merge-entry))
|
||||
(if merge?
|
||||
;; We're merging. If a subtotal exists, store
|
||||
;; it in dual-subtotal. Do NOT add column to row.
|
||||
(let loop ((merging? #f)
|
||||
(last-column #f)
|
||||
(columns columns)
|
||||
(merge-list merge-list))
|
||||
(if (not (null? columns))
|
||||
(let* ((mon (retrieve-commodity (car columns) commodity))
|
||||
(this-column (and mon (gnc:gnc-monetary-amount mon))))
|
||||
(if (car merge-list)
|
||||
;; We're merging. If a subtotal exists, send to next loop iteration.
|
||||
(loop #t
|
||||
this-column
|
||||
(cdr columns)
|
||||
(cdr merge-list))
|
||||
(begin
|
||||
(set! dual-subtotal column-amount)
|
||||
(set! start-dual-column? #t))
|
||||
(if start-dual-column?
|
||||
(begin
|
||||
;; We've completed merging. Add the negated
|
||||
;; column amount and add the columns to row.
|
||||
(if column-amount
|
||||
(set! dual-subtotal
|
||||
(- (or dual-subtotal 0) column-amount)))
|
||||
(cond ((not dual-subtotal)
|
||||
(addto! row-contents "")
|
||||
(addto! row-contents ""))
|
||||
((positive? dual-subtotal)
|
||||
(addto! row-contents
|
||||
(gnc:make-html-table-cell/markup
|
||||
(if merging?
|
||||
;; We're completing merge. Display debit-credit in correct column.
|
||||
(let* ((sum (and (or last-column this-column)
|
||||
(- (or last-column 0) (or this-column 0))))
|
||||
(sum-table-cell (and sum (gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(gnc:make-gnc-monetary
|
||||
commodity
|
||||
dual-subtotal)))
|
||||
(addto! row-contents ""))
|
||||
(else
|
||||
(addto! row-contents "")
|
||||
(addto! row-contents
|
||||
(gnc:make-html-table-cell/markup
|
||||
"total-number-cell"
|
||||
(gnc:make-gnc-monetary
|
||||
commodity
|
||||
(- dual-subtotal))))))
|
||||
(set! start-dual-column? #f)
|
||||
(set! dual-subtotal #f))
|
||||
;; Default; not merging/completed merge. Just
|
||||
;; display monetary amount
|
||||
(addto! row-contents
|
||||
(gnc:make-html-table-cell/markup "total-number-cell" mon))))))
|
||||
columns
|
||||
merge-list)))
|
||||
commodity (abs sum)))))
|
||||
(debit-col (and sum (positive? sum) sum-table-cell))
|
||||
(credit-col (and sum (not (positive? sum)) sum-table-cell)))
|
||||
(addto! row-contents (or debit-col ""))
|
||||
(addto! row-contents (or credit-col "")))
|
||||
;; Default; not merging nor completed merge. Display monetary amount
|
||||
(addto! row-contents (gnc:make-html-table-cell/markup "total-number-cell" mon)))
|
||||
(loop #f
|
||||
#f
|
||||
(cdr columns)
|
||||
(cdr merge-list))))))))
|
||||
|
||||
;; we only wish to add the first column into the grid.
|
||||
(if (pair? columns)
|
||||
@ -1678,45 +1668,30 @@ tags within description, notes or memo. ")
|
||||
(set! grid (grid-del grid row col)) ;we simply delete old data stored at row/col and
|
||||
(set! grid (cons (vector row col data) grid)) ;add again. this is fine because the grid should
|
||||
grid) ;never have duplicate data in the trep.
|
||||
(define (grid->html grid list-of-rows list-of-cols)
|
||||
(define (cell->html cell)
|
||||
(define (grid->html-table grid list-of-rows list-of-cols)
|
||||
(define (make-table-cell row col)
|
||||
(let ((cell (grid-get grid row col)))
|
||||
(if (pair? cell)
|
||||
(string-append "<td class=\"number-cell\">"
|
||||
(string-join (map gnc:monetary->string
|
||||
(vector-ref (car cell) 2))
|
||||
"<br/>\n")
|
||||
"</td>\n")
|
||||
"<td></td>\n"))
|
||||
(define (row->html row list-of-cols)
|
||||
(string-append "<tr><td>"
|
||||
(if (eq? row 'row-total)
|
||||
(_ "Grand Total")
|
||||
(cdr row))
|
||||
"</td>\n"
|
||||
(string-join (map
|
||||
(lambda (col) (cell->html (grid-get grid row col)))
|
||||
list-of-cols) "")
|
||||
(cell->html (grid-get grid row 'col-total))
|
||||
"</tr>\n"))
|
||||
(string-append "<table class=\"summary-table\"><caption>"
|
||||
optname-grid
|
||||
"</caption><thead><tr>"
|
||||
"<th></th>\n"
|
||||
(string-join (map (lambda (col)
|
||||
(string-append "<th class=\"column-heading-right\">"
|
||||
(cdr col)
|
||||
"</th>\n")) list-of-cols) "")
|
||||
"<th class=\"column-heading-right\">"
|
||||
(_ "Total")
|
||||
"</th>\n</tr>\n</thead><tbody>"
|
||||
(string-join (map (lambda (row)
|
||||
(row->html row list-of-cols))
|
||||
list-of-rows) "")
|
||||
(gnc:make-html-table-cell/markup "number-cell" (car (vector-ref (car cell) 2)))
|
||||
"")))
|
||||
(define (make-row row)
|
||||
(append
|
||||
(list (if (eq? row 'row-total) (_ "Grand Total") (cdr row)))
|
||||
(map (lambda (col) (make-table-cell row col))
|
||||
list-of-cols)
|
||||
(list (make-table-cell row 'col-total))))
|
||||
(let ((table (gnc:make-html-table)))
|
||||
(gnc:html-table-set-caption! table optname-grid)
|
||||
(gnc:html-table-set-col-headers! table (append (list "") (map cdr list-of-cols) (list (_ "Total"))))
|
||||
(gnc:html-table-set-style! table "th"
|
||||
'attribute (list "class" "column-heading-right"))
|
||||
(for-each
|
||||
(lambda (row)
|
||||
(gnc:html-table-append-row! table (make-row row)))
|
||||
list-of-rows)
|
||||
(if (memq 'row-total (grid-rows grid))
|
||||
(row->html 'row-total list-of-cols)
|
||||
"")
|
||||
"</tbody></table>\n"))
|
||||
|
||||
(gnc:html-table-append-row! table (make-row 'row-total)))
|
||||
table))
|
||||
|
||||
;; ;;;;;;;;;;;;;;;;;;;;
|
||||
;; Here comes the renderer function for this report.
|
||||
@ -1757,11 +1732,13 @@ tags within description, notes or memo. ")
|
||||
(let* ((document (gnc:make-html-document))
|
||||
(account-matcher (opt-val pagename-filter optname-account-matcher))
|
||||
(account-matcher-regexp (and (opt-val pagename-filter optname-account-matcher-regex)
|
||||
(make-regexp account-matcher)))
|
||||
(catch 'regular-expression-syntax
|
||||
(lambda () (make-regexp account-matcher))
|
||||
(const 'invalid-regex))))
|
||||
(c_account_0 (opt-val gnc:pagename-accounts optname-accounts))
|
||||
(c_account_1 (filter
|
||||
(lambda (acc)
|
||||
(if account-matcher-regexp
|
||||
(if (regexp? account-matcher-regexp)
|
||||
(regexp-exec account-matcher-regexp (gnc-account-get-full-name acc))
|
||||
(string-contains (gnc-account-get-full-name acc) account-matcher)))
|
||||
c_account_0))
|
||||
@ -1775,7 +1752,9 @@ tags within description, notes or memo. ")
|
||||
(opt-val gnc:pagename-general optname-enddate))))
|
||||
(transaction-matcher (opt-val pagename-filter optname-transaction-matcher))
|
||||
(transaction-matcher-regexp (and (opt-val pagename-filter optname-transaction-matcher-regex)
|
||||
(make-regexp transaction-matcher)))
|
||||
(catch 'regular-expression-syntax
|
||||
(lambda () (make-regexp transaction-matcher))
|
||||
(const 'invalid-regex))))
|
||||
(reconcile-status-filter (keylist-get-info reconcile-status-list
|
||||
(opt-val pagename-filter optname-reconcile-status)
|
||||
'filter-types))
|
||||
@ -1848,7 +1827,9 @@ tags within description, notes or memo. ")
|
||||
(generic-less? X Y 'date 'none #t))
|
||||
|
||||
|
||||
(if (or (null? c_account_1) (and-map not c_account_1))
|
||||
(if (or (or (null? c_account_1) (and-map not c_account_1))
|
||||
(eq? account-matcher-regexp 'invalid-regex)
|
||||
(eq? transaction-matcher-regexp 'invalid-regex))
|
||||
|
||||
;; error condition: no accounts specified or obtained after filtering
|
||||
(begin
|
||||
@ -1879,6 +1860,8 @@ tags within description, notes or memo. ")
|
||||
((non-void-only) (gnc:query-set-match-non-voids-only! query (gnc-get-current-book)))
|
||||
((void-only) (gnc:query-set-match-voids-only! query (gnc-get-current-book)))
|
||||
(else #f))
|
||||
(if reconcile-status-filter
|
||||
(xaccQueryAddClearedMatch query reconcile-status-filter QOF-QUERY-AND))
|
||||
(if (not custom-sort?)
|
||||
(begin
|
||||
(qof-query-set-sort-order query
|
||||
@ -1906,7 +1889,6 @@ tags within description, notes or memo. ")
|
||||
;; - include/exclude splits to/from selected accounts
|
||||
;; - substring/regex matcher for Transaction Description/Notes/Memo
|
||||
;; - custom-split-filter, a split->bool function for derived reports
|
||||
;; - by reconcile status
|
||||
(set! splits (filter
|
||||
(lambda (split)
|
||||
(let* ((trans (xaccSplitGetParent split))
|
||||
@ -1924,9 +1906,7 @@ tags within description, notes or memo. ")
|
||||
(match? (xaccSplitGetMemo split)))
|
||||
(or (not custom-split-filter) ; #f = ignore custom-split-filter
|
||||
(custom-split-filter split))
|
||||
(or (not reconcile-status-filter) ; #f = ignore reconcile-status-filter
|
||||
(memv (xaccSplitGetReconcile split)
|
||||
reconcile-status-filter)))))
|
||||
)))
|
||||
splits))
|
||||
|
||||
(if (null? splits)
|
||||
@ -1967,7 +1947,7 @@ tags within description, notes or memo. ")
|
||||
(list-of-rows (stable-sort! (delete 'row-total (grid-rows grid)) generic<?))
|
||||
(list-of-cols (stable-sort! (delete 'col-total (grid-cols grid)) generic<?)))
|
||||
(gnc:html-document-add-object!
|
||||
document (grid->html grid list-of-rows list-of-cols))))
|
||||
document (grid->html-table grid list-of-rows list-of-cols))))
|
||||
|
||||
(if (eq? infobox-display 'always)
|
||||
(gnc:html-document-add-object!
|
||||
|
||||
Loading…
Reference in New Issue
Block a user