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

balance-sheet/income-statement{-pnl}: swap guids

Browse Source
This commit is contained in:
Christopher Lam 2020-04-25 14:05:57 +08:00
parent 858cf17473
commit 5fb8d3dcdf
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnucash/report/reports/standard/balance-sheet.scm
View File

@ -69,7 +69,7 @@
(use-modules (gnucash app-utils)) (use-modules (gnucash app-utils))
(use-modules (gnucash report)) (use-modules (gnucash report))
(define reportname (N_ "Balance Sheet")) (define reportname "Balance Sheet (legacy)")
;; define all option's names and help text so that they are properly ;; define all option's names and help text so that they are properly
;; defined in *one* place. ;; defined in *one* place.
@ -559,9 +559,10 @@
(gnc:define-report (gnc:define-report
'version 1 'version 1
'name reportname 'name reportname
'report-guid "c4173ac99b2b448289bf4d11c731af13" 'report-guid "c4173ac99b2b448289bf4d11c731af13-old"
'menu-path (list gnc:menuname-asset-liability) 'menu-path (list gnc:menuname-asset-liability)
'options-generator balance-sheet-options-generator 'options-generator balance-sheet-options-generator
'renderer balance-sheet-renderer) 'renderer balance-sheet-renderer
'in-menu? (gnc-prefs-is-extra-enabled))
;; END ;; END

30
gnucash/report/reports/standard/balsheet-pnl.scm
View File

@ -44,12 +44,6 @@
(split-balance col-datum-get-split-balance) (split-balance col-datum-get-split-balance)
(split-value-balance col-datum-get-split-value-balance)) (split-value-balance col-datum-get-split-value-balance))
(define FOOTER-TEXT
(gnc:make-html-text
(_ "WARNING: Foreign currency conversions, and unrealized gains
calculations are not confirmed correct. This report may be modified
without notice. Bug reports are very welcome at
https://bugs.gnucash.org/")))
;; define all option's names and help text so that they are properly ;; define all option's names and help text so that they are properly
@ -1279,30 +1273,36 @@ also show overall period profit & loss."))
(gnc:html-document-add-object! (gnc:html-document-add-object!
doc multicol-table)) doc multicol-table))
(gnc:html-document-add-object!
doc FOOTER-TEXT)
(gnc:report-finished) (gnc:report-finished)
;; (gnc:html-document-set-style-text! ;; (gnc:html-document-set-style-text!
;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}") ;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}")
doc)) doc))
(define balsheet-reportname (_ "Balance Sheet (Multicolumn)")) (define balsheet-reportname (_ "Balance Sheet"))
(define pnl-reportname (_ "Income Statement (Multicolumn)")) (define is-reportname (_ "Income Statement"))
(define pnl-reportname (_ "Profit & Loss"))
(gnc:define-report (gnc:define-report
'version 1 'version 1
'name balsheet-reportname 'name balsheet-reportname
'report-guid "065d5d5a77ba11e8b31e83ada73c5eea" 'report-guid "c4173ac99b2b448289bf4d11c731af13"
'menu-path (list gnc:menuname-experimental) 'menu-path (list gnc:menuname-asset-liability)
'options-generator (lambda () (multicol-report-options-generator 'balsheet)) 'options-generator (lambda () (multicol-report-options-generator 'balsheet))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'balsheet))) 'renderer (lambda (rpt) (multicol-report-renderer rpt 'balsheet)))
(gnc:define-report
'version 1
'name is-reportname
'report-guid "0b81a3bdfd504aff849ec2e8630524bc"
'menu-path (list gnc:menuname-income-expense)
'options-generator (lambda () (multicol-report-options-generator 'pnl))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl)))
(gnc:define-report (gnc:define-report
'version 1 'version 1
'name pnl-reportname 'name pnl-reportname
'report-guid "0e94fd0277ba11e8825d43e27232c9d4" 'report-guid "8758ba23984c40dea5527f5f0ca2779e"
'menu-path (list gnc:menuname-experimental) 'menu-path (list gnc:menuname-income-expense)
'options-generator (lambda () (multicol-report-options-generator 'pnl)) 'options-generator (lambda () (multicol-report-options-generator 'pnl))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl))) 'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl)))

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

@ -569,8 +569,8 @@
doc)) doc))
(define is-reportname (N_ "Income Statement")) (define is-reportname "Income Statement (legacy)")
(define pnl-reportname (N_ "Profit & Loss")) (define pnl-reportname "Profit & Loss (legacy)")
(define (income-statement-options-generator) (define (income-statement-options-generator)
(income-statement-options-generator-internal is-reportname)) (income-statement-options-generator-internal is-reportname))
@ -586,19 +586,21 @@
(gnc:define-report (gnc:define-report
'version 1 'version 1
'name is-reportname 'name is-reportname
'report-guid "0b81a3bdfd504aff849ec2e8630524bc" 'report-guid "0b81a3bdfd504aff849ec2e8630524bc-old"
'menu-path (list gnc:menuname-income-expense) 'menu-path (list gnc:menuname-income-expense)
'options-generator income-statement-options-generator 'options-generator income-statement-options-generator
'renderer income-statement-renderer) 'renderer income-statement-renderer
'in-menu? (gnc-prefs-is-extra-enabled))
;; Also make a "Profit & Loss" report, even if it's the exact same one, ;; Also make a "Profit & Loss" report, even if it's the exact same one,
;; just relabeled. ;; just relabeled.
(gnc:define-report (gnc:define-report
'version 1 'version 1
'name pnl-reportname 'name pnl-reportname
'report-guid "8758ba23984c40dea5527f5f0ca2779e" 'report-guid "8758ba23984c40dea5527f5f0ca2779e-old"
'menu-path (list gnc:menuname-income-expense) 'menu-path (list gnc:menuname-income-expense)
'options-generator profit-and-loss-options-generator 'options-generator profit-and-loss-options-generator
'renderer profit-and-loss-renderer) 'renderer profit-and-loss-renderer
'in-menu? (gnc-prefs-is-extra-enabled))
;; END ;; END

8
gnucash/report/reports/standard/test/test-balsheet-pnl.scm
View File

@ -15,10 +15,10 @@
;; This is implementation testing for Balance Sheet and Profit&Loss. ;; This is implementation testing for Balance Sheet and Profit&Loss.
(define balance-sheet-uuid "c4173ac99b2b448289bf4d11c731af13") (define balance-sheet-uuid "c4173ac99b2b448289bf4d11c731af13-old")
(define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc") (define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc-old")
(define multicol-balsheet-uuid "065d5d5a77ba11e8b31e83ada73c5eea") (define multicol-balsheet-uuid "c4173ac99b2b448289bf4d11c731af13")
(define multicol-pnl-uuid "0e94fd0277ba11e8825d43e27232c9d4") (define multicol-pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc")
;; Explicitly set locale to make the report output predictable ;; Explicitly set locale to make the report output predictable
(setlocale LC_ALL "C") (setlocale LC_ALL "C")