diff --git a/gnucash/report/reports/standard/balance-sheet.scm b/gnucash/report/reports/standard/balance-sheet.scm index beb78e97b8..2221d5e617 100644 --- a/gnucash/report/reports/standard/balance-sheet.scm +++ b/gnucash/report/reports/standard/balance-sheet.scm @@ -69,7 +69,7 @@ (use-modules (gnucash app-utils)) (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 ;; defined in *one* place. @@ -559,9 +559,10 @@ (gnc:define-report 'version 1 'name reportname - 'report-guid "c4173ac99b2b448289bf4d11c731af13" + 'report-guid "c4173ac99b2b448289bf4d11c731af13-old" 'menu-path (list gnc:menuname-asset-liability) 'options-generator balance-sheet-options-generator - 'renderer balance-sheet-renderer) + 'renderer balance-sheet-renderer + 'in-menu? (gnc-prefs-is-extra-enabled)) ;; END diff --git a/gnucash/report/reports/standard/balsheet-pnl.scm b/gnucash/report/reports/standard/balsheet-pnl.scm index cf820d317f..b303ab6759 100644 --- a/gnucash/report/reports/standard/balsheet-pnl.scm +++ b/gnucash/report/reports/standard/balsheet-pnl.scm @@ -44,12 +44,6 @@ (split-balance col-datum-get-split-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 @@ -1279,30 +1273,36 @@ also show overall period profit & loss.")) (gnc:html-document-add-object! doc multicol-table)) - (gnc:html-document-add-object! - doc FOOTER-TEXT) - (gnc:report-finished) ;; (gnc:html-document-set-style-text! ;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}") doc)) -(define balsheet-reportname (_ "Balance Sheet (Multicolumn)")) -(define pnl-reportname (_ "Income Statement (Multicolumn)")) +(define balsheet-reportname (_ "Balance Sheet")) +(define is-reportname (_ "Income Statement")) +(define pnl-reportname (_ "Profit & Loss")) (gnc:define-report 'version 1 'name balsheet-reportname - 'report-guid "065d5d5a77ba11e8b31e83ada73c5eea" - 'menu-path (list gnc:menuname-experimental) + 'report-guid "c4173ac99b2b448289bf4d11c731af13" + 'menu-path (list gnc:menuname-asset-liability) 'options-generator (lambda () (multicol-report-options-generator '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 'version 1 'name pnl-reportname - 'report-guid "0e94fd0277ba11e8825d43e27232c9d4" - 'menu-path (list gnc:menuname-experimental) + 'report-guid "8758ba23984c40dea5527f5f0ca2779e" + 'menu-path (list gnc:menuname-income-expense) 'options-generator (lambda () (multicol-report-options-generator 'pnl)) 'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl))) diff --git a/gnucash/report/reports/standard/income-statement.scm b/gnucash/report/reports/standard/income-statement.scm index 42c8a3cab3..14979563a9 100644 --- a/gnucash/report/reports/standard/income-statement.scm +++ b/gnucash/report/reports/standard/income-statement.scm @@ -569,8 +569,8 @@ doc)) -(define is-reportname (N_ "Income Statement")) -(define pnl-reportname (N_ "Profit & Loss")) +(define is-reportname "Income Statement (legacy)") +(define pnl-reportname "Profit & Loss (legacy)") (define (income-statement-options-generator) (income-statement-options-generator-internal is-reportname)) @@ -586,19 +586,21 @@ (gnc:define-report 'version 1 'name is-reportname - 'report-guid "0b81a3bdfd504aff849ec2e8630524bc" + 'report-guid "0b81a3bdfd504aff849ec2e8630524bc-old" 'menu-path (list gnc:menuname-income-expense) '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, ;; just relabeled. (gnc:define-report 'version 1 'name pnl-reportname - 'report-guid "8758ba23984c40dea5527f5f0ca2779e" + 'report-guid "8758ba23984c40dea5527f5f0ca2779e-old" 'menu-path (list gnc:menuname-income-expense) '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 diff --git a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm index e865d20170..acaf7c3912 100644 --- a/gnucash/report/reports/standard/test/test-balsheet-pnl.scm +++ b/gnucash/report/reports/standard/test/test-balsheet-pnl.scm @@ -15,10 +15,10 @@ ;; This is implementation testing for Balance Sheet and Profit&Loss. -(define balance-sheet-uuid "c4173ac99b2b448289bf4d11c731af13") -(define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc") -(define multicol-balsheet-uuid "065d5d5a77ba11e8b31e83ada73c5eea") -(define multicol-pnl-uuid "0e94fd0277ba11e8825d43e27232c9d4") +(define balance-sheet-uuid "c4173ac99b2b448289bf4d11c731af13-old") +(define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc-old") +(define multicol-balsheet-uuid "c4173ac99b2b448289bf4d11c731af13") +(define multicol-pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc") ;; Explicitly set locale to make the report output predictable (setlocale LC_ALL "C")