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

[income-gst-statement] no need to reverse report amounts

Browse Source 
this report handles reversal of income amounts and shouldn't
re-reverse according to originating split's account type.

also friendly-fn should be #f instead of (lambda (a) "") because the
former is handled specifically in trep-engine's add-subheading to
display a blank cell.
This commit is contained in:
Christopher Lam 2020-01-10 23:34:23 +08:00
parent c8eb3b3738
commit baba7f0deb
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnucash/report/standard-reports/income-gst-statement.scm
View File

@ -195,7 +195,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
;; each column will be a vector ;; each column will be a vector
;; (vector heading - string ;; (vector heading - string
;; calculator-function - (calculator-function split) to obtain amount ;; calculator-function - (calculator-function split) to obtain amount
;; reverse-column? - #t for sales, #f for purchases ;; reverse-column? - #f - already handled via myneg in fns above
;; subtotal? - #t - all columns need subtotals ;; subtotal? - #t - all columns need subtotals
;; start-dual-column? - unused in GST report ;; start-dual-column? - unused in GST report
;; friendly-heading-fn - unused in GST report ;; friendly-heading-fn - unused in GST report
@ -203,74 +203,61 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
;; Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales ;; Translators: "Gross Sales" refer to Net Sales + GST/VAT on Sales
(list (vector (_ "Gross Sales") (list (vector (_ "Gross Sales")
gross-sales gross-sales
#t #t #f #f #t #f #f))
(lambda (a) "")))
(if (opt-val gnc:pagename-display (N_ "Individual sales columns")) (if (opt-val gnc:pagename-display (N_ "Individual sales columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc) (map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder-neg acc) (account-adder-neg acc)
#t #t #f #f #t #f #f))
(lambda (a) "")))
accounts-sales) accounts-sales)
(list (vector (_ "Net Sales") (list (vector (_ "Net Sales")
sales-without-tax sales-without-tax
#t #t #f #f #t #f #f)))
(lambda (a) ""))))
(if (opt-val gnc:pagename-display (N_ "Individual tax columns")) (if (opt-val gnc:pagename-display (N_ "Individual tax columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc) (map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder-neg acc) (account-adder-neg acc)
#t #t #f #f #t #f #f))
(lambda (a) "")))
accounts-tax-collected) accounts-tax-collected)
(list (vector (_ "Tax on Sales") (list (vector (_ "Tax on Sales")
tax-on-sales tax-on-sales
#t #t #f #f #t #f #f)))
(lambda (a) ""))))
;; Translators: "Gross Purchases" refer to Net Purchase + GST/VAT on Purchase ;; Translators: "Gross Purchases" refer to Net Purchase + GST/VAT on Purchase
(list (vector (_ "Gross Purchases") (list (vector (_ "Gross Purchases")
gross-purchases gross-purchases
#f #t #f #f #t #f #f))
(lambda (a) "")))
(if (opt-val gnc:pagename-display (N_ "Individual purchases columns")) (if (opt-val gnc:pagename-display (N_ "Individual purchases columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc) (map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder acc) (account-adder acc)
#f #t #f #f #t #f #f))
(lambda (a) "")))
accounts-purchases) accounts-purchases)
(list (vector (_ "Net Purchases") (list (vector (_ "Net Purchases")
purchases-without-tax purchases-without-tax
#f #t #f #f #t #f #f)))
(lambda (a) ""))))
(if (opt-val gnc:pagename-display (N_ "Individual tax columns")) (if (opt-val gnc:pagename-display (N_ "Individual tax columns"))
(map (lambda (acc) (vector (xaccAccountGetName acc) (map (lambda (acc) (vector (xaccAccountGetName acc)
(account-adder acc) (account-adder acc)
#f #t #f #f #t #f #f))
(lambda (a) "")))
accounts-tax-paid) accounts-tax-paid)
(list (vector (_ "Tax on Purchases") (list (vector (_ "Tax on Purchases")
tax-on-purchases tax-on-purchases
#f #t #f #f #t #f #f)))
(lambda (a) ""))))
(if (opt-val gnc:pagename-display (N_ "Gross Balance")) (if (opt-val gnc:pagename-display (N_ "Gross Balance"))
;; Translators: "Gross Balance" refer to "Gross Sales - Gross Purchases" in GST Report ;; Translators: "Gross Balance" refer to "Gross Sales - Gross Purchases" in GST Report
(list (vector (_ "Gross Balance") (list (vector (_ "Gross Balance")
gross-balance gross-balance
#f #t #f #f #t #f #f))
(lambda (a) "")))
'()) '())
;; Note: Net income = net balance - other costs ;; Note: Net income = net balance - other costs
(if (opt-val gnc:pagename-display (N_ "Net Balance")) (if (opt-val gnc:pagename-display (N_ "Net Balance"))
;; Translators: "Net Balance" refer to Net Sales - Net Purchases in GST Report ;; Translators: "Net Balance" refer to Net Sales - Net Purchases in GST Report
(list (vector (_ "Net Balance") (list (vector (_ "Net Balance")
net-balance net-balance
#f #t #f #f #t #f #f))
(lambda (a) "")))
'()) '())
(if (opt-val gnc:pagename-display (N_ "Tax payable")) (if (opt-val gnc:pagename-display (N_ "Tax payable"))
;; Translators: "Tax Payable" refer to the difference GST Sales - GST Purchases ;; Translators: "Tax Payable" refer to the difference GST Sales - GST Purchases
(list (vector (_ "Tax payable") (list (vector (_ "Tax payable")
tax-payable tax-payable
#f #t #f #f #t #f #f))
(lambda (a) "")))
'())))) '()))))
;; Define the report. ;; Define the report.