From 9d85ee65d8ffb31bd51f7ee68c3bde64190261d3 Mon Sep 17 00:00:00 2001 From: christopherlam Date: Fri, 15 Sep 2017 21:21:30 +0800 Subject: [PATCH] Initial commit income-gst-report.scm Suitable for annual income & expense tax return. Also suitable for GST/VAT returns. Derived from transaction.scm Also handle voided transactions correctly --- .../standard-reports/income-gst-statement.scm | 888 +++++++++++------- 1 file changed, 561 insertions(+), 327 deletions(-) diff --git a/gnucash/report/standard-reports/income-gst-statement.scm b/gnucash/report/standard-reports/income-gst-statement.scm index eac38808aa..18df9ddb12 100644 --- a/gnucash/report/standard-reports/income-gst-statement.scm +++ b/gnucash/report/standard-reports/income-gst-statement.scm @@ -1,7 +1,8 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; transaction-report.scm : Report on all transactions in account(s) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Income-GST-Statement.scm : Produce report suitable for +;; annual income tax returns and periodic VAT/GST reporting. ;; -;; Original report by Robert Merkel +;; Original transaction.scm report by Robert Merkel ;; Contributions by Bryan Larsen ;; More contributions for new report generation code by Robert Merkel ;; More contributions by Christian Stimming @@ -9,6 +10,8 @@ ;; Michael T. Garrison Stuber ;; Modified account names display by Tomas Pospisek ;; with a lot of help from "warlord" +;; Heavily amended by Christopher Lam to add calculations +;; appropriate for GST/VAT, building on efforts by Doug Doughty. ;; ;; This program is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -29,16 +32,14 @@ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(define-module (gnucash report standard-reports transaction)) +(define-module (gnucash report standard-reports income-gst-statement)) (use-modules (gnucash main)) ;; FIXME: delete after we finish modularizing. (use-modules (srfi srfi-1)) (use-modules (srfi srfi-13)) (use-modules (gnucash gnc-module)) (use-modules (gnucash gettext)) - (use-modules (gnucash printf)) - (gnc:module-load "gnucash/report/report-system" 0) (define-macro (addto! alist element) @@ -46,18 +47,25 @@ ;; Define the strings here to avoid typos and make changes easier. -(define reportname (N_ "Transaction Report")) -(define optname-detail-level (N_ "Detail Level")) +(define reportname (N_ "Income & GST Statement")) (define pagename-sorting (N_ "Sorting")) (define optname-prime-sortkey (N_ "Primary Key")) (define optname-prime-subtotal (N_ "Primary Subtotal")) +(define optname-prime-sortorder (N_ "Primary Sort Order")) (define optname-prime-date-subtotal (N_ "Primary Subtotal for Date Key")) +(define optname-full-account-name (N_ "Show Full Account Name")) +(define optname-show-account-code (N_ "Show Account Code")) (define optname-sec-sortkey (N_ "Secondary Key")) (define optname-sec-subtotal (N_ "Secondary Subtotal")) +(define optname-sec-sortorder (N_ "Secondary Sort Order")) (define optname-sec-date-subtotal (N_ "Secondary Subtotal for Date Key")) (define optname-void-transactions (N_ "Void Transactions")) (define optname-table-export (N_ "Table for Exporting")) (define optname-common-currency (N_ "Common Currency")) +(define TAX-SETUP-DESC "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.") (define optname-currency (N_ "Report's currency")) (define def:grand-total-style "grand-total") (define def:normal-row-style "normal-row") @@ -211,36 +219,50 @@ table width subheading-style)) -(define (add-subtotal-row table width subtotal-string subtotal-collector +(define (add-subtotal-row table width subtotal-string subtotal-collectors subtotal-style export?) - (let ((currency-totals (subtotal-collector - 'format gnc:make-gnc-monetary #f)) - (blanks (gnc:make-html-table-cell/size 1 (- width 1) #f))) - (gnc:html-table-append-row/markup! - table - subtotal-style - (if export? - (append! (cons (gnc:make-html-table-cell/markup "total-label-cell" subtotal-string) - (gnc:html-make-empty-cells (- width 2))) - (list (gnc:make-html-table-cell/markup - "total-number-cell" - (car currency-totals)))) - (list (gnc:make-html-table-cell/size/markup 1 (- width 1) "total-label-cell" - subtotal-string) - (gnc:make-html-table-cell/markup - "total-number-cell" - (car currency-totals))))) - (for-each (lambda (currency) - (gnc:html-table-append-row/markup! - table - subtotal-style - (append! - (if export? - (gnc:html-make-empty-cells (- width 1)) - (list blanks)) - (list (gnc:make-html-table-cell/markup - "total-number-cell" currency))))) - (cdr currency-totals)))) + (let* ((row-contents '()) + (columns (map (lambda (coll) (coll 'format gnc:make-gnc-monetary #f)) subtotal-collectors)) + (list-of-commodities (delete-duplicates (map gnc:gnc-monetary-commodity (apply append columns))))) + + (define (retrieve-commodity list-of-monetary commodity) + (if (null? list-of-monetary) + #f + (if (gnc-commodity-equal (gnc:gnc-monetary-commodity (car list-of-monetary)) commodity) + (car list-of-monetary) + (retrieve-commodity (cdr list-of-monetary) commodity)))) + + (define (add-first-column string) + (if export? + (begin + (addto! row-contents (gnc:make-html-table-cell/markup "total-label-cell" string)) + (for-each (lambda (cell) (addto! row-contents cell)) + (gnc:html-make-empty-cells (- width 1)))) + (addto! row-contents (gnc:make-html-table-cell/size/markup 1 width "total-label-cell" string)))) + + (define (add-columns commodity) + (for-each (lambda (column) + (addto! row-contents + (gnc:make-html-table-cell/markup + "total-number-cell" + (retrieve-commodity column commodity)))) + columns)) + + ;first row + (add-first-column subtotal-string) + (add-columns (if (pair? list-of-commodities) + (car list-of-commodities) + #f)) ;to account for empty-row subtotals + (gnc:html-table-append-row/markup! table subtotal-style (reverse row-contents)) + + ;subsequent rows + (if (pair? list-of-commodities) + (for-each (lambda (commodity) + (set! row-contents '()) + (add-first-column "") + (add-columns commodity) + (gnc:html-table-append-row/markup! table subtotal-style (reverse row-contents))) + (cdr list-of-commodities))))) (define (total-string str) (string-append (_ "Total For ") str)) @@ -333,8 +355,7 @@ (vector-ref columns-used 9)) (define (used-amount-double-negative columns-used) (vector-ref columns-used 10)) -(define (used-running-balance columns-used) - (vector-ref columns-used 11)) + (define (used-account-full-name columns-used) (vector-ref columns-used 12)) (define (used-memo columns-used) @@ -378,8 +399,7 @@ (define (opt-val section name) (gnc:option-value (gnc:lookup-option options section name))) - (let ((column-list (make-vector columns-used-size #f)) - (is-single? (eq? (opt-val gnc:pagename-display optname-detail-level) 'single))) + (let ((column-list (make-vector columns-used-size #f))) (if (opt-val gnc:pagename-display (N_ "Date")) (vector-set! column-list 0 #t)) (if (opt-val gnc:pagename-display (N_ "Reconciled Date")) @@ -392,29 +412,28 @@ (vector-set! column-list 3 #t)) (if (opt-val gnc:pagename-display (N_ "Account Name")) (vector-set! column-list 4 #t)) - (if (and is-single? (opt-val gnc:pagename-display (N_ "Other Account Name"))) + (if (opt-val gnc:pagename-display (N_ "Other Account Name")) (vector-set! column-list 5 #t)) - (if (opt-val gnc:pagename-display (N_ "Shares")) - (vector-set! column-list 6 #t)) - (if (opt-val gnc:pagename-display (N_ "Price")) - (vector-set! column-list 7 #t)) - (let ((amount-setting (opt-val gnc:pagename-display (N_ "Amount")))) - (if (eq? amount-setting 'single) - (vector-set! column-list 8 #t)) - (if (eq? amount-setting 'double) - (begin (vector-set! column-list 9 #t) - (vector-set! column-list 10 #t)))) - (if (opt-val gnc:pagename-display (N_ "Running Balance")) - (vector-set! column-list 11 #t)) + ;(if (opt-val gnc:pagename-display (N_ "Shares")) + ; (vector-set! column-list 6 #t)) + ;(if (opt-val gnc:pagename-display (N_ "Price")) + ; (vector-set! column-list 7 #t)) + ;(let ((amount-setting (opt-val gnc:pagename-display (N_ "Amount")))) + ; (if (eq? amount-setting 'single) + ; (vector-set! column-list 8 #t)) + ; (if (eq? amount-setting 'double) + ; (begin (vector-set! column-list 9 #t) + ; (vector-set! column-list 10 #t)))) + (if (opt-val gnc:pagename-display (N_ "Use Full Account Name")) (vector-set! column-list 12 #t)) (if (opt-val gnc:pagename-display (N_ "Memo")) (vector-set! column-list 13 #t)) (if (opt-val gnc:pagename-display (N_ "Account Code")) (vector-set! column-list 14 #t)) - (if (and is-single? (opt-val gnc:pagename-display (N_ "Other Account Code"))) + (if (opt-val gnc:pagename-display (N_ "Other Account Code")) (vector-set! column-list 15 #t)) - (if (and is-single? (opt-val gnc:pagename-display (N_ "Use Full Other Account Name"))) + (if (opt-val gnc:pagename-display (N_ "Use Full Other Account Name")) (vector-set! column-list 16 #t)) (if (opt-val pagename-sorting (N_ "Show Account Code")) (vector-set! column-list 17 #t)) @@ -424,7 +443,7 @@ (vector-set! column-list 19 #t)) column-list)) -(define (make-heading-list column-vector options) +(define (make-heading-list column-vector calculated-cells options) (let ((heading-list '())) (if (used-date column-vector) (addto! heading-list (_ "Date"))) @@ -453,54 +472,58 @@ (addto! heading-list (_ "Account"))) (if (or (used-other-account-name column-vector) (used-other-account-code column-vector)) (addto! heading-list (_ "Transfer from/to"))) - (if (used-shares column-vector) - (addto! heading-list (_ "Shares"))) - (if (used-price column-vector) - (addto! heading-list (_ "Price"))) - (if (used-amount-single column-vector) - (addto! heading-list (_ "Amount"))) + ;(if (used-shares column-vector) + ; (addto! heading-list (_ "Shares"))) + ;(if (used-price column-vector) + ; (addto! heading-list (_ "Price"))) + ;(if (used-amount-single column-vector) + ; (addto! heading-list (_ "Amount"))) ;; FIXME: Proper labels: what? (if (used-amount-double-positive column-vector) (addto! heading-list (_ "Debit"))) (if (used-amount-double-negative column-vector) (addto! heading-list (_ "Credit"))) - (if (used-running-balance column-vector) - (addto! heading-list (_ "Balance"))) + + + (for-each (lambda (arg) + (addto! heading-list + (gnc:make-html-table-cell/markup + "column-heading-right" + (car arg)))) + calculated-cells) + (reverse heading-list))) -(define (add-split-row table split column-vector options +(define (add-split-row table split column-vector cell-calculators options row-style account-types-to-reverse transaction-row?) - (define (opt-val section name) (gnc:option-value (gnc:lookup-option options section name))) - + (let* ((row-contents '()) (dummy (gnc:debug "split is originally" split)) (parent (xaccSplitGetParent split)) (account (xaccSplitGetAccount split)) (account-type (xaccAccountGetType account)) - (currency (if (not (null? account)) - (xaccAccountGetCommodity account) - (gnc-default-currency))) + (currency (xaccTransGetCurrency parent)) + ;the following cannot be used, because we're using each split's tax currency + ;(if (not (null? account)) + ; (xaccAccountGetCommodity account) + ; (gnc-default-currency))) (report-currency (if (opt-val gnc:pagename-general optname-common-currency) (opt-val gnc:pagename-general optname-currency) currency)) - (damount (if (gnc:split-voided? split) - (xaccSplitVoidFormerAmount split) - (xaccSplitGetAmount split))) (trans-date (gnc-transaction-get-date-posted parent)) - (split-value (gnc:exchange-by-pricedb-nearest - (gnc:make-gnc-monetary - currency - (if (member account-type account-types-to-reverse) - (gnc-numeric-neg damount) - damount)) + (converted (lambda (num) + (gnc:exchange-by-pricedb-nearest + (gnc:make-gnc-monetary currency num) report-currency - ;; Use midday as the transaction time so it matches a price - ;; on the same day. Otherwise it uses midnight which will - ;; likely match a price on the previous day - (timespecCanonicalDayTime trans-date)))) + (timespecCanonicalDayTime trans-date))))) + + (define cells + (map (lambda (cell) + (converted ((cdr cell) split))) + cell-calculators)) (if (used-date column-vector) (addto! row-contents @@ -564,44 +587,47 @@ (used-other-account-name column-vector) (used-other-account-full-name column-vector)))) - (if (used-shares column-vector) - (addto! row-contents (xaccSplitGetAmount split))) - (if (used-price column-vector) - (addto! - row-contents - (gnc:make-gnc-monetary (xaccTransGetCurrency parent) - (xaccSplitGetSharePrice split)))) - (if (used-amount-single column-vector) - (addto! row-contents - (gnc:make-html-table-cell/markup "number-cell" - (gnc:html-transaction-anchor parent split-value)))) - (if (used-amount-double-positive column-vector) - (if (gnc-numeric-positive-p (gnc:gnc-monetary-amount split-value)) - (addto! row-contents - (gnc:make-html-table-cell/markup "number-cell" - (gnc:html-transaction-anchor parent split-value))) - (addto! row-contents " "))) - (if (used-amount-double-negative column-vector) - (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount split-value)) - (addto! row-contents - (gnc:make-html-table-cell/markup - "number-cell" (gnc:html-transaction-anchor parent (gnc:monetary-neg split-value)))) - (addto! row-contents " "))) - (if (used-running-balance column-vector) - (begin - (gnc:debug "split is " split) - (gnc:debug "split get balance:" (xaccSplitGetBalance split)) - (addto! row-contents - (gnc:make-html-table-cell/markup - "number-cell" - (gnc:make-gnc-monetary currency - (xaccSplitGetBalance split)))))) + ;(if (used-shares column-vector) + ; (addto! row-contents (xaccSplitGetAmount split))) + ;(if (used-price column-vector) + ; (addto! + ; row-contents + ; (gnc:make-gnc-monetary (xaccTransGetCurrency parent) + ; (xaccSplitGetSharePrice split)))) + ;(if (used-amount-single column-vector) + ; (addto! row-contents + ; (gnc:make-html-table-cell/markup "number-cell" + ; (gnc:html-transaction-anchor parent split-value)))) + ;(if (used-amount-double-positive column-vector) + ; (if (gnc-numeric-positive-p (gnc:gnc-monetary-amount split-value)) + ; (addto! row-contents + ; (gnc:make-html-table-cell/markup "number-cell" + ; (gnc:html-transaction-anchor parent split-value))) + ; (addto! row-contents " "))) + ;(if (used-amount-double-negative column-vector) + ; (if (gnc-numeric-negative-p (gnc:gnc-monetary-amount split-value)) + ; (addto! row-contents + ; (gnc:make-html-table-cell/markup + ; "number-cell" (gnc:html-transaction-anchor parent (gnc:monetary-neg split-value)))) + ; (addto! row-contents " "))) + + (for-each (lambda (cell) + (if cell + + (addto! row-contents + (gnc:make-html-table-cell/markup + "number-cell" + (gnc:html-transaction-anchor + parent + (gnc:make-gnc-monetary report-currency cell)))) + (addto! row-contents (gnc:html-make-empty-cell)))) + cells) + (gnc:html-table-append-row/markup! table row-style (reverse row-contents)) - split-value)) + cells)) - -(define date-sorting-types (list 'date 'exact-time 'register-order)) +(define date-sorting-types (list 'date 'register-order)) (define (trep-options-generator) (define gnc:*transaction-report-options* (gnc:new-options)) @@ -615,6 +641,18 @@ gnc:pagename-general (N_ "Start Date") (N_ "End Date") "a") + ;(gnc:register-trep-option + ; (gnc:make-multichoice-option + ; gnc:pagename-general (N_ "Style") + ; "d" (N_ "Report style.") + ; 'single + ; (list (vector 'multi-line + ; (N_ "Multi-Line") + ; (N_ "Display N lines.")) + ; (vector 'single + ; (N_ "Single") + ; (N_ "Display 1 line."))))) + (gnc:register-trep-option (gnc:make-complex-boolean-option gnc:pagename-general optname-common-currency @@ -624,8 +662,7 @@ gnc:*transaction-report-options* gnc:pagename-general optname-currency - x)) - )) + x)))) (gnc:options-add-currency! gnc:*transaction-report-options* gnc:pagename-general optname-currency "f") @@ -633,15 +670,16 @@ (gnc:register-trep-option (gnc:make-simple-boolean-option gnc:pagename-general optname-table-export - "g" (N_ "Formats the table suitable for cut & paste exporting with extra cells.") #f)) + "g" (N_ "Formats the table suitable for cut & paste exporting with extra cells.") #f)) ;; Accounts options ;; account to do report on + (gnc:register-trep-option - (gnc:make-account-list-option + (gnc:make-account-list-limited-option gnc:pagename-accounts (N_ "Accounts") - "a" (N_ "Report on these accounts.") + "b1" (N_ "Report on these accounts.") ;; select, by default, no accounts! Selecting all accounts will ;; always imply an insanely long waiting time upon opening, and it ;; is almost never useful. So we instead display the normal error @@ -649,20 +687,33 @@ ;; continue. (lambda () '()) - #f #t)) + #f #t + (list ACCT-TYPE-INCOME ACCT-TYPE-EXPENSE ACCT-TYPE-PAYABLE ACCT-TYPE-RECEIVABLE))) (gnc:register-trep-option (gnc:make-string-option gnc:pagename-accounts (N_ "Account Substring") - "a5" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \ + "b15" (N_ "Match only above accounts whose fullname contains substring e.g. ':Travel' will \ match Expenses:Travel:Holiday and Expenses:Business:Travel. Can be left blank, which will \ disable the substring filter. This filter is case-sensitive.") "")) + (gnc:register-trep-option + (gnc:make-account-list-limited-option + gnc:pagename-accounts (N_ "Tax Accounts") + "b17" (N_ "Please find and select the accounts which will hold the tax 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.") + (lambda () + '()) + #f #t + (list ACCT-TYPE-ASSET ACCT-TYPE-LIABILITY))) + (gnc:register-trep-option (gnc:make-account-list-option gnc:pagename-accounts (N_ "Filter By...") - "b" (N_ "Filter on these accounts.") + "b2" (N_ "Filter on these accounts.") (lambda () ;; FIXME : gnc:get-current-accounts disappeared. (let* ((current-accounts '()) @@ -733,10 +784,6 @@ disable the substring filter. This filter is case-sensitive.") (N_ "Date") (N_ "Sort by date.")) - (vector 'exact-time - (N_ "Exact Time") - (N_ "Sort by exact time.")) - (vector 'reconciled-date (N_ "Reconciled Date") (N_ "Sort by the Reconciled Date.")) @@ -788,10 +835,6 @@ disable the substring filter. This filter is case-sensitive.") (N_ "Date") (N_ "Sort by date.")) - (vector 'exact-time - (N_ "Exact Time") - (N_ "Sort by exact time.")) - (vector 'reconciled-date (N_ "Reconciled Date") (N_ "Sort by the Reconciled Date.")) @@ -839,54 +882,100 @@ disable the substring filter. This filter is case-sensitive.") (vector 'weekly (N_ "Weekly") (N_ "Weekly.")) (vector 'monthly (N_ "Monthly") (N_ "Monthly.")) (vector 'quarterly (N_ "Quarterly") (N_ "Quarterly.")) - (vector 'yearly (N_ "Yearly") (N_ "Yearly."))))) + (vector 'yearly (N_ "Yearly") (N_ "Yearly.")))) + + (prime-sortkey 'account-name) + (prime-sortkey-subtotal-true #t) + (sec-sortkey 'register-order) + (sec-sortkey-subtotal-true #f)) + + (define (apply-selectable-by-name-sorting-options) + (let* ((prime-sortkey-enabled (not (eq? prime-sortkey 'none))) + (prime-sortkey-subtotal-enabled (member prime-sortkey subtotal-enabled)) + (prime-date-sortingtype-enabled (member prime-sortkey date-sorting-types)) + (sec-sortkey-enabled (not (eq? sec-sortkey 'none))) + (sec-sortkey-subtotal-enabled (member sec-sortkey subtotal-enabled)) + (sec-date-sortingtype-enabled (member sec-sortkey date-sorting-types))) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-prime-subtotal + prime-sortkey-subtotal-enabled) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-prime-sortorder + prime-sortkey-enabled) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-sec-subtotal + sec-sortkey-subtotal-enabled) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-sec-sortorder + sec-sortkey-enabled) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-full-account-name + (or (and prime-sortkey-subtotal-enabled prime-sortkey-subtotal-true) + (and sec-sortkey-subtotal-enabled sec-sortkey-subtotal-true))) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-show-account-code + (or (and prime-sortkey-subtotal-enabled prime-sortkey-subtotal-true) + (and sec-sortkey-subtotal-enabled sec-sortkey-subtotal-true))) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-prime-date-subtotal + prime-date-sortingtype-enabled) + + (gnc-option-db-set-option-selectable-by-name + options pagename-sorting optname-sec-date-subtotal + sec-date-sortingtype-enabled))) ;; primary sorting criterion (gnc:register-trep-option (gnc:make-multichoice-callback-option pagename-sorting optname-prime-sortkey "a" (N_ "Sort by this criterion first.") - 'account-name + prime-sortkey key-choice-list #f (lambda (x) - (gnc-option-db-set-option-selectable-by-name - options pagename-sorting optname-prime-subtotal - (and (member x subtotal-enabled) #t)) - (gnc-option-db-set-option-selectable-by-name - options pagename-sorting optname-prime-date-subtotal - (if (member x date-sorting-types) #t #f))))) + (set! prime-sortkey x) + (apply-selectable-by-name-sorting-options)))) (gnc:register-trep-option (gnc:make-simple-boolean-option - pagename-sorting (N_ "Show Full Account Name") - "a1" + pagename-sorting optname-full-account-name + "j1" (N_ "Show the full account name for subtotals and subtitles?") #f)) (gnc:register-trep-option (gnc:make-simple-boolean-option - pagename-sorting (N_ "Show Account Code") - "a2" + pagename-sorting optname-show-account-code + "j2" (N_ "Show the account code for subtotals and subtitles?") #f)) (gnc:register-trep-option - (gnc:make-simple-boolean-option + (gnc:make-complex-boolean-option pagename-sorting optname-prime-subtotal - "c" + "e5" (N_ "Subtotal according to the primary key?") - #t)) + prime-sortkey-subtotal-true #f + (lambda (x) + (set! prime-sortkey-subtotal-true x) + (apply-selectable-by-name-sorting-options)))) (gnc:register-trep-option (gnc:make-multichoice-option pagename-sorting optname-prime-date-subtotal - "d" (N_ "Do a date subtotal.") + "e2" (N_ "Do a date subtotal.") 'monthly subtotal-choice-list)) (gnc:register-trep-option (gnc:make-multichoice-option - pagename-sorting (N_ "Primary Sort Order") + pagename-sorting optname-prime-sortorder "e" (N_ "Order of primary sorting.") 'ascend ascending-choice-list)) @@ -897,33 +986,32 @@ disable the substring filter. This filter is case-sensitive.") pagename-sorting optname-sec-sortkey "f" (N_ "Sort by this criterion second.") - 'register-order + sec-sortkey key-choice-list #f (lambda (x) - (gnc-option-db-set-option-selectable-by-name - options pagename-sorting optname-sec-subtotal - (and (member x subtotal-enabled) #t)) - (gnc-option-db-set-option-selectable-by-name - options pagename-sorting optname-sec-date-subtotal - (if (member x date-sorting-types) #t #f))))) + (set! sec-sortkey x) + (apply-selectable-by-name-sorting-options)))) (gnc:register-trep-option - (gnc:make-simple-boolean-option + (gnc:make-complex-boolean-option pagename-sorting optname-sec-subtotal - "g" + "i5" (N_ "Subtotal according to the secondary key?") - #t)) + sec-sortkey-subtotal-true #f + (lambda (x) + (set! sec-sortkey-subtotal-true x) + (apply-selectable-by-name-sorting-options)))) (gnc:register-trep-option (gnc:make-multichoice-option pagename-sorting optname-sec-date-subtotal - "h" (N_ "Do a date subtotal.") - 'monthly + "i2" (N_ "Do a date subtotal.") + 'none subtotal-choice-list)) (gnc:register-trep-option (gnc:make-multichoice-option - pagename-sorting (N_ "Secondary Sort Order") + pagename-sorting optname-sec-sortorder "i" (N_ "Order of Secondary sorting.") 'ascend ascending-choice-list))) @@ -945,18 +1033,23 @@ disable the substring filter. This filter is case-sensitive.") (list (N_ "Num") "b" (N_ "Display the check number?") #t)) (list (N_ "Description") "c" (N_ "Display the description?") #t) (list (N_ "Notes") "d2" (N_ "Display the notes if the memo is unavailable?") #t) - (list (N_ "Account Name") "e" (N_ "Display the account name?") #f) + ;; account name option appears here (list (N_ "Use Full Account Name") "f" (N_ "Display the full account name?") #t) (list (N_ "Account Code") "g" (N_ "Display the account code?") #f) - (list (N_ "Other Account Name") "h1" (N_ "Display the other account name?\ - (if this is a split transaction, this parameter is guessed).") #f) - (list (N_ "Use Full Other Account Name") "i" (N_ "Display the full account name?") #t) + ;; other account name option appears here + (list (N_ "Use Full Other Account Name") "i" (N_ "Display the full account name?") #f) (list (N_ "Other Account Code") "j" (N_ "Display the other account code?") #f) - (list (N_ "Shares") "k" (N_ "Display the number of shares?") #f) - (list (N_ "Price") "l" (N_ "Display the shares price?") #f) + ;(list (N_ "Shares") "k" (N_ "Display the number of shares?") #f) + ;(list (N_ "Price") "l" (N_ "Display the shares price?") #f) ;; note the "Amount" multichoice option in between here - (list (N_ "Running Balance") "n" (N_ "Display a running balance?") #f) - (list (N_ "Totals") "o" (N_ "Display the totals?") #t))) + (list (N_ "Totals") "o" (N_ "Display the totals?") #t) + (list (N_ "Individual income columns") "p" (N_ "Display individual income columns rather than their sum") #f) + (list (N_ "Individual expense columns") "q" (N_ "Display individual expense columns rather than their sum") #f) + (list (N_ "Individual tax columns") "r" (N_ "Display individual tax columns rather than their sum") #f) + (list (N_ "Remittance amount") "s" (N_ "Display the remittance amount (total sales - total purchases)") #f) + (list (N_ "Net Income") "t" (N_ "Display the net income (sales without tax - purchases without tax)") #f) + (list (N_ "Tax payable") "t" (N_ "Display the tax payable (tax on sales - tax on purchases)") #f) + )) (if (qof-book-use-split-action-for-num-field (gnc-get-current-book)) (gnc:register-trep-option @@ -977,54 +1070,52 @@ disable the substring filter. This filter is case-sensitive.") (N_ "Notes") x)))) + ;; Ditto for Account Name #t -> Use Full Account Name is selectable (gnc:register-trep-option - (gnc:make-multichoice-callback-option - gnc:pagename-display optname-detail-level - "h" (N_ "Amount of detail to display per transaction.") - 'single - (list (vector 'multi-line - (N_ "Multi-Line") - (N_ "Display all splits in a transaction on a separate line.")) - (vector 'single - (N_ "Single") - (N_ "Display one line per transaction, merging multiple splits where required."))) + (gnc:make-complex-boolean-option + gnc:pagename-display (N_ "Account Name") + "e" (N_ "Display the account name?") #t #f - (lambda (x) - (let ((is-single? (eq? x 'single))) - (gnc-option-db-set-option-selectable-by-name - gnc:*transaction-report-options* - gnc:pagename-display (N_ "Other Account Name") is-single?) - (gnc-option-db-set-option-selectable-by-name - gnc:*transaction-report-options* - gnc:pagename-display (N_ "Use Full Other Account Name") is-single?) - (gnc-option-db-set-option-selectable-by-name - gnc:*transaction-report-options* - gnc:pagename-display (N_ "Other Account Code") is-single?))))) - + (lambda (x) (gnc-option-db-set-option-selectable-by-name + gnc:*transaction-report-options* + gnc:pagename-display + (N_ "Use Full Account Name") + x)))) + ;; Ditto for Other Account Name #t -> Use Full Other Account Name is selectable (gnc:register-trep-option - (gnc:make-multichoice-option - gnc:pagename-display (N_ "Amount") - "m" (N_ "Display the amount?") - 'single - (list - (vector 'none (N_ "None") (N_ "No amount display.")) - (vector 'single (N_ "Single") (N_ "Single Column Display.")) - (vector 'double (N_ "Double") (N_ "Two Column Display."))))) + (gnc:make-complex-boolean-option + gnc:pagename-display (N_ "Other Account Name") + "h5" (N_ "Display the other account name? (if this is a split transaction, this parameter is guessed).") #f + #f + (lambda (x) (gnc-option-db-set-option-selectable-by-name + gnc:*transaction-report-options* + gnc:pagename-display + (N_ "Use Full Other Account Name") + x)))) + + ;(gnc:register-trep-option + ; (gnc:make-multichoice-option + ; gnc:pagename-display (N_ "Amount") + ; "m" (N_ "Display the amount?") + ; 'single + ; (list + ; (vector 'none (N_ "None") (N_ "No amount display.")) + ; (vector 'single (N_ "Single") (N_ "Single Column Display.")) + ; (vector 'double (N_ "Double") (N_ "Two Column Display.")) + ; ))) - (gnc:register-trep-option - (gnc:make-multichoice-option - gnc:pagename-display (N_ "Sign Reverses") - "p" (N_ "Reverse amount display for certain account types.") - 'credit-accounts - (list - (vector 'none (N_ "None") (N_ "Don't change any displayed amounts.")) - (vector 'income-expense (N_ "Income and Expense") - (N_ "Reverse amount display for Income and Expense Accounts.")) - (vector 'credit-accounts (N_ "Credit Accounts") - (N_ "Reverse amount display for Liability, Payable, Equity, \ -Credit Card, and Income accounts."))))) - + ;(gnc:register-trep-option + ; (gnc:make-multichoice-option + ; gnc:pagename-display (N_ "Sign Reverses") + ; "p" (N_ "Reverse amount display for certain account types.") + ; 'none + ; (list + ; (vector 'none (N_ "None") (N_ "Don't change any displayed amounts.")) + ; (vector 'income-expense (N_ "Income and Expense") + ; (N_ "Reverse amount display for Income and Expense Accounts.")) + ; (vector 'credit-accounts (N_ "Credit Accounts") + ; (N_ "Reverse amount display for Liability, Payable, Equity, Credit Card, and Income accounts."))))) (gnc:options-set-default-section gnc:*transaction-report-options* gnc:pagename-general) @@ -1071,6 +1162,10 @@ Credit Card, and Income accounts."))))) ;; ;;;;;;;;;;;;;;;;;;;; ;; Here comes the big function that builds the whole table. (define (make-split-table splits options + accounts-tax-paid + accounts-tax-collected + accounts-sales + accounts-purchases primary-subtotal-pred secondary-subtotal-pred primary-subheading-renderer @@ -1081,18 +1176,86 @@ Credit Card, and Income accounts."))))) (let ((work-to-do (length splits)) (work-done 0) (used-columns (build-column-used options))) - (define (get-account-types-to-reverse options) - (cdr (assq (gnc:option-value - (gnc:lookup-option options - gnc:pagename-display - (N_ "Sign Reverses"))) - account-types-to-reverse-assoc-list))) + + (define calculated-cells + (letrec + ((myadd (lambda (X Y) (if X (if Y (gnc-numeric-add X Y GNC-DENOM-AUTO GNC-RND-ROUND) X) Y))) + (myneg (lambda (X) (if X (gnc-numeric-neg X) #f))) + (split-adder (lambda (split accountlist typefilter) + (let* ((transaction (xaccSplitGetParent split)) + (splits-in-transaction (xaccTransGetSplitList transaction)) + (sum #f)) + (for-each (lambda (s) + (let* ((splitAcc (xaccSplitGetAccount s)) + (splitVal (if (xaccTransGetVoidStatus transaction) + (xaccSplitVoidFormerValue s) + (xaccSplitGetValue s))) + (splitCommodity (xaccAccountGetCommodity splitAcc)) + (splitAccType (xaccAccountGetType splitAcc)) + (splitAccName (xaccAccountGetName splitAcc))) + (if accountlist + (if (member splitAcc accountlist) + (set! sum (myadd sum splitVal)))) + (if typefilter + (if (eq? typefilter splitAccType) + (set! sum (myadd sum splitVal)))))) + splits-in-transaction) + sum))) + ;(sales-without-tax (lambda (s) (split-adder s #f ACCT-TYPE-INCOME))) + ;(purchases-without-tax (lambda (s) (split-adder s #f ACCT-TYPE-EXPENSE))) + (tax-on-sales (lambda (s) (split-adder s accounts-tax-collected #f))) + (tax-on-purchases (lambda (s) (split-adder s accounts-tax-paid #f))) + (sales-without-tax (lambda (s) (split-adder s accounts-sales #f))) + (purchases-without-tax (lambda (s) (split-adder s accounts-purchases #f))) + (account-adder (lambda (acc) (lambda (s) (split-adder s (list acc) #f)))) + (total-sales (lambda (s) (myadd (tax-on-sales s) (sales-without-tax s)))) + (total-purchases (lambda (s) (myadd (tax-on-purchases s) (purchases-without-tax s)))) + (bank-remittance (lambda (s) (myneg (myadd (total-sales s) (total-purchases s))))) + (net-income (lambda (s) (myneg (myadd (sales-without-tax s) (purchases-without-tax s))))) + (tax-payable (lambda (s) (myneg (myadd (tax-on-purchases s) (tax-on-sales s)))))) + (append + (list (cons "Total Sales" total-sales)) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Individual income columns"))) + (map (lambda (acc) (cons (xaccAccountGetName acc) (account-adder acc))) + accounts-sales) + (list (cons "Net Sales" sales-without-tax))) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Individual tax columns"))) + (map (lambda (acc) (cons (xaccAccountGetName acc) (account-adder acc))) + accounts-tax-collected) + (list (cons "Tax on Sales" tax-on-sales))) + (list (cons "Total Purchases" total-purchases)) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Individual expense columns"))) + (map (lambda (acc) (cons (xaccAccountGetName acc) (account-adder acc))) + accounts-purchases) + (list (cons "Net Purchases" purchases-without-tax))) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Individual tax columns"))) + (map (lambda (acc) (cons (xaccAccountGetName acc) (account-adder acc))) + accounts-tax-paid) + (list (cons "Tax on Purchases" tax-on-purchases))) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Remittance amount"))) + (list (cons "Remittance" bank-remittance)) + '()) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Net Income"))) + (list (cons "Net Income" net-income)) + '()) + (if (gnc:option-value (gnc:lookup-option options gnc:pagename-display (N_ "Tax payable"))) + (list (cons "Tax Payable" tax-payable)) + '()) + ))) + + + ;(define (get-account-types-to-reverse options) + ; (cdr (assq (gnc:option-value + ; (gnc:lookup-option options + ; gnc:pagename-display + ; (N_ "Sign Reverses"))) + ; account-types-to-reverse-assoc-list))) - (define (transaction-report-multi-rows-p options) - (eq? (gnc:option-value - (gnc:lookup-option options gnc:pagename-display optname-detail-level)) - 'multi-line)) + ;(define (transaction-report-multi-rows-p options) + ; (eq? (gnc:option-value + ; (gnc:lookup-option options gnc:pagename-general (N_ "Style"))) + ; 'multi-line)) (define (transaction-report-export-p options) (gnc:option-value @@ -1107,7 +1270,7 @@ Credit Card, and Income accounts."))))) ((equal? current split) (other-rows-driver split parent table used-columns (+ i 1))) (else (begin - (add-split-row table current used-columns options + (add-split-row table current used-columns calculated-cells options row-style account-types-to-reverse #f) (other-rows-driver split parent table used-columns (+ i 1))))))) @@ -1129,9 +1292,9 @@ Credit Card, and Income accounts."))))) secondary-subheading-renderer primary-subtotal-renderer secondary-subtotal-renderer - primary-subtotal-collector - secondary-subtotal-collector - total-collector) + primary-subtotal-collectors + secondary-subtotal-collectors + total-collectors) (gnc:report-percent-done (* 100 (/ work-done work-to-do))) (set! work-done (+ 1 work-done)) @@ -1144,7 +1307,7 @@ Credit Card, and Income accounts."))))) (gnc:make-html-table-cell/size 1 width (gnc:make-html-text (gnc:html-markup-hr))))) (if (gnc:option-value (gnc:lookup-option options "Display" "Totals")) - (render-grand-total table width total-collector export?))) + (render-grand-total table width total-collectors export?))) (let* ((current (car splits)) (current-row-style (if multi-rows? def:normal-row-style @@ -1153,59 +1316,64 @@ Credit Card, and Income accounts."))))) (rest (cdr splits)) (next (if (null? rest) #f (car rest))) - (split-value (add-split-row - table - current - used-columns - options - current-row-style - account-types-to-reverse - #t))) + (split-values (add-split-row + table + current + used-columns + calculated-cells + options + current-row-style + account-types-to-reverse + #t))) (if multi-rows? (add-other-split-rows current table used-columns def:alternate-row-style account-types-to-reverse)) - (primary-subtotal-collector 'add - (gnc:gnc-monetary-commodity - split-value) - (gnc:gnc-monetary-amount - split-value)) - (secondary-subtotal-collector 'add - (gnc:gnc-monetary-commodity - split-value) - (gnc:gnc-monetary-amount - split-value)) - (total-collector 'add - (gnc:gnc-monetary-commodity split-value) - (gnc:gnc-monetary-amount split-value)) + (map (lambda (collector value) + (if value + (collector 'add (gnc:gnc-monetary-commodity value) (gnc:gnc-monetary-amount value)))) + primary-subtotal-collectors + split-values) + + (map (lambda (collector value) + (if value + (collector 'add (gnc:gnc-monetary-commodity value) (gnc:gnc-monetary-amount value)))) + secondary-subtotal-collectors + split-values) + + (map (lambda (collector value) + (if value + (collector 'add (gnc:gnc-monetary-commodity value) (gnc:gnc-monetary-amount value)))) + total-collectors + split-values) (if (and primary-subtotal-pred (or (not next) (and next (not (primary-subtotal-pred current next))))) - (begin + (begin (if secondary-subtotal-pred - (begin (secondary-subtotal-renderer table width current - secondary-subtotal-collector + secondary-subtotal-collectors def:secondary-subtotal-style used-columns export?) - (secondary-subtotal-collector 'reset #f #f))) + (for-each (lambda (coll) (coll 'reset #f #f)) + secondary-subtotal-collectors))) (primary-subtotal-renderer table width current - primary-subtotal-collector + primary-subtotal-collectors def:primary-subtotal-style used-columns export?) - (primary-subtotal-collector 'reset #f #f) + (for-each (lambda (coll) (coll 'reset #f #f)) + primary-subtotal-collectors) (if next (begin (primary-subheading-renderer next table width def:primary-subtotal-style used-columns) - (if secondary-subtotal-pred (secondary-subheading-renderer next @@ -1219,9 +1387,10 @@ Credit Card, and Income accounts."))))) current next))))) (begin (secondary-subtotal-renderer table width current - secondary-subtotal-collector + secondary-subtotal-collectors def:secondary-subtotal-style used-columns export?) - (secondary-subtotal-collector 'reset #f #f) + (for-each (lambda (coll) (coll 'reset #f #f)) + secondary-subtotal-collectors) (if next (secondary-subheading-renderer next table width @@ -1241,21 +1410,20 @@ Credit Card, and Income accounts."))))) secondary-subheading-renderer primary-subtotal-renderer secondary-subtotal-renderer - primary-subtotal-collector - secondary-subtotal-collector - total-collector)))) + primary-subtotal-collectors + secondary-subtotal-collectors + total-collectors)))) (let* ((table (gnc:make-html-table)) (width (num-columns-required used-columns)) - (multi-rows? (transaction-report-multi-rows-p options)) - (export? (transaction-report-export-p options)) - (account-types-to-reverse - (get-account-types-to-reverse options))) + (multi-rows? #f) ;disable. (transaction-report-multi-rows-p options)) + (export? (transaction-report-export-p options)) + (account-types-to-reverse '())) ;disabled. (get-account-types-to-reverse '()))options))) (gnc:html-table-set-col-headers! table - (make-heading-list used-columns options)) - ;; (gnc:warn "Splits:" splits) + (make-heading-list used-columns calculated-cells options)) + (if (not (null? splits)) (begin (if primary-subheading-renderer @@ -1275,22 +1443,24 @@ Credit Card, and Income accounts."))))) secondary-subheading-renderer primary-subtotal-renderer secondary-subtotal-renderer - (gnc:make-commodity-collector) - (gnc:make-commodity-collector) - (gnc:make-commodity-collector)))) + (map (lambda (x) (gnc:make-commodity-collector)) calculated-cells) + (map (lambda (x) (gnc:make-commodity-collector)) calculated-cells) + (map (lambda (x) (gnc:make-commodity-collector)) calculated-cells) + ;(gnc:make-commodity-collector) + ;(gnc:make-commodity-collector) + ;(gnc:make-commodity-collector) + ))) table))) + ;; ;;;;;;;;;;;;;;;;;;;; ;; Here comes the renderer function for this report. (define (trep-renderer report-obj) - (define options (gnc:report-options report-obj)) - (define (opt-val section name) (gnc:option-value (gnc:lookup-option options section name))) - (define comp-funcs-assoc-list ;; Defines the different sorting keys, together with the ;; subtotal functions. Each entry: (cons @@ -1308,9 +1478,6 @@ Credit Card, and Income accounts."))))) split-account-code-same-p render-account-subheading render-account-subtotal)) - (cons 'exact-time (vector - (list SPLIT-TRANS TRANS-DATE-POSTED) - #f #f #f)) (cons 'date (vector (list SPLIT-TRANS TRANS-DATE-POSTED) #f #f #f)) @@ -1405,6 +1572,18 @@ Credit Card, and Income accounts."))))) ;;(define (get-other-account-names account-list) ;; ( map (lambda (acct) (gnc-account-get-full-name acct)) account-list)) + (define (splits-filter-unique-transactions splits) + (let ((have-trans-hash (make-hash-table))) + (define (only-one-copy? split) + (let* ((parent (xaccSplitGetParent split)) + (trans-guid (gncTransGetGUID parent))) + (if (hash-ref have-trans-hash trans-guid #f) + #f ; already have a copy of this transaction + (begin + (hash-set! have-trans-hash trans-guid #t) + #t)))) + (filter only-one-copy? splits))) + (define (is-filter-member split account-list) (let* ((txn (xaccSplitGetParent split)) (splitcount (xaccTransCountSplits txn))) @@ -1442,38 +1621,43 @@ Credit Card, and Income accounts."))))) ;; Single transaction splits (else #f)))) - (gnc:report-starting reportname) - (let ((document (gnc:make-html-document)) - (c_account_1 (opt-val gnc:pagename-accounts "Accounts")) - (c_account_substring (opt-val gnc:pagename-accounts "Account Substring")) - (c_account_2 (opt-val gnc:pagename-accounts "Filter By...")) - (filter-mode (opt-val gnc:pagename-accounts "Filter Type")) - (begindate (gnc:timepair-start-day-time - (gnc:date-option-absolute-time - (opt-val gnc:pagename-general "Start Date")))) - (enddate (gnc:timepair-end-day-time - (gnc:date-option-absolute-time - (opt-val gnc:pagename-general "End Date")))) - (report-title (opt-val - gnc:pagename-general - gnc:optname-reportname)) - (primary-key (opt-val pagename-sorting optname-prime-sortkey)) - (primary-order (opt-val pagename-sorting "Primary Sort Order")) - (secondary-key (opt-val pagename-sorting optname-sec-sortkey)) - (secondary-order (opt-val pagename-sorting "Secondary Sort Order")) - (void-status (opt-val gnc:pagename-accounts optname-void-transactions)) - (splits '()) - (query (qof-query-create-for-splits))) + + (let* ((document (gnc:make-html-document)) + (c_account_0 (opt-val gnc:pagename-accounts "Accounts")) + (c_account_substring (opt-val gnc:pagename-accounts "Account Substring")) + (c_account_1 (filter + (lambda (acc) + (string-contains (gnc-account-get-full-name acc) c_account_substring)) + c_account_0)) + (c_account_2 (opt-val gnc:pagename-accounts "Filter By...")) + (tax-accounts (opt-val gnc:pagename-accounts "Tax Accounts")) + (accounts-tax-collected (filter (lambda (acc) (eq? (xaccAccountGetType acc) ACCT-TYPE-LIABILITY)) tax-accounts)) + (accounts-tax-paid (filter (lambda (acc) (eq? (xaccAccountGetType acc) ACCT-TYPE-ASSET)) tax-accounts)) + (accounts-sales (filter (lambda (acc) (eq? (xaccAccountGetType acc) ACCT-TYPE-INCOME)) c_account_1)) + (accounts-purchases (filter (lambda (acc) (eq? (xaccAccountGetType acc) ACCT-TYPE-EXPENSE)) c_account_1)) + (filter-mode (opt-val gnc:pagename-accounts "Filter Type")) + (begindate (gnc:timepair-start-day-time + (gnc:date-option-absolute-time + (opt-val gnc:pagename-general "Start Date")))) + (enddate (gnc:timepair-end-day-time + (gnc:date-option-absolute-time + (opt-val gnc:pagename-general "End Date")))) + (report-title (opt-val + gnc:pagename-general + gnc:optname-reportname)) + (primary-key (opt-val pagename-sorting optname-prime-sortkey)) + (primary-order (opt-val pagename-sorting "Primary Sort Order")) + (secondary-key (opt-val pagename-sorting optname-sec-sortkey)) + (secondary-order (opt-val pagename-sorting "Secondary Sort Order")) + (void-status (opt-val gnc:pagename-accounts optname-void-transactions)) + (splits '()) + (query (qof-query-create-for-splits))) - ;;(gnc:warn "accts in trep-renderer:" c_account_1) - ;;(gnc:warn "Report Account names:" (get-other-account-names c_account_1)) + ;(gnc:warn "c1 is " c_account_1) + ;(gnc:warn "c2 is " c_account_2) + ;(gnc:warn "first c1 is " (xaccAccountGetName (car c_account_1))) - (set! c_account_1 - (filter (lambda (acc) - (string-contains (gnc-account-get-full-name acc) c_account_substring)) - c_account_1)) - (if (not (or (null? c_account_1) (and-map not c_account_1))) (begin (qof-query-set-book query (gnc-get-current-book)) @@ -1513,24 +1697,37 @@ Credit Card, and Income accounts."))))) ;;(gnc:warn "Including Filter Accounts") (set! splits (filter (lambda (split) (is-filter-member split c_account_2)) - splits)) - ) - ) + splits)))) (if (eq? filter-mode 'exclude) (begin ;;(gnc:warn "Excluding Filter Accounts") (set! splits (filter (lambda (split) (not (is-filter-member split c_account_2))) - splits)) - ) - ) - + splits)))) + + ; We have to remove duplicates because the report will *sum* amounts in a transaction + ; otherwise it will double count where transaction contains 2 splits in same account + (set! splits (splits-filter-unique-transactions splits)) + + ; For each split, we will optionally only keep those which contain useful data + ; e.g. show invoices & regular transactions + (set! splits (filter + (lambda (split) + (let* ((trans (xaccSplitGetParent split)) + (txn-type (xaccTransGetTxnType trans))) + (member txn-type (list TXN-TYPE-NONE TXN-TYPE-INVOICE)))) + splits)) + (if (not (null? splits)) (let ((table (make-split-table splits options + accounts-tax-paid + accounts-tax-collected + accounts-sales + accounts-purchases (get-subtotal-pred optname-prime-sortkey optname-prime-subtotal optname-prime-date-subtotal) @@ -1557,6 +1754,30 @@ Credit Card, and Income accounts."))))) (gnc:make-html-text (gnc:html-markup-h3 (display-date-interval begindate enddate)))) + + (gnc:html-document-add-object! + document + (gnc:make-html-text + (gnc:html-markup-p + "Input Tax accounts: " + (string-join (map gnc-account-get-full-name accounts-tax-paid) ", ")))) + + (gnc:html-document-add-object! + document + (gnc:make-html-text + (gnc:html-markup-p + "Output Tax accounts: " + (string-join (map gnc-account-get-full-name accounts-tax-collected) ", ")))) + + (if (null? (append accounts-tax-collected accounts-tax-paid)) + (gnc:html-document-add-object! + document + (gnc:make-html-text + (gnc:html-markup-p + "There are no input/output tax accounts set up. This is probably not what" + " you want. " + TAX-SETUP-DESC)))) + (gnc:html-document-add-object! document table) @@ -1568,29 +1789,42 @@ Credit Card, and Income accounts."))))) (gnc:html-markup-h2 (_ "No matching transactions found")) (gnc:html-markup-p - (_ "No transactions were found that \ -match the time interval and account selection specified \ -in the Options panel."))) + (_ "No transactions were found that match the time interval and account selection specified in the Options panel."))) (gnc:html-document-add-object! document p)))) ;; error condition: no accounts specified - (gnc:html-document-add-object! - document - (gnc:html-make-no-account-warning - report-title (gnc:report-id report-obj)))) + (begin + (gnc:html-document-add-object! + document + (gnc:html-make-no-account-warning + report-title (gnc:report-id report-obj))) + + (gnc:html-document-add-object! + document + (gnc:make-html-text + (gnc:html-markup-p + "This report is useful to calculate periodic business tax payable/receivable from" + " authorities. From Edit report options 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.") + (gnc:html-markup-p + " 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."))) + + (gnc:html-document-add-object! + document + (gnc:make-html-text + (gnc:html-markup-p TAX-SETUP-DESC))))) (gnc:report-finished) document)) ;; Define the report. (gnc:define-report - 'version 1 - + 'menu-path (list gnc:menuname-income-expense) 'name reportname - 'report-guid "2fe3b9833af044abb929a88d5a59620f" - + 'report-guid "5bf27f249a0d11e7abc4cec278b6b50a" 'options-generator trep-options-generator - 'renderer trep-renderer)