Revert guid-dance "balance-sheet/income-statement{-pnl}: swap guids"

This reverts commit 5fb8d3dcdf.

Because Multicolumn Balance Sheet is not ready yet.

gnucash/report/reports/standard/balance-sheet.scm

@@ -69,7 +69,7 @@
 (use-modules (gnucash app-utils))
 (use-modules (gnucash report))
 
-(define reportname "Balance Sheet (legacy)")
+(define reportname (N_ "Balance Sheet"))
 
 ;; define all option's names and help text so that they are properly
 ;; defined in *one* place.
@@ -287,9 +287,6 @@
      (gnc:lookup-option
       (gnc:report-options report-obj) pagename optname)))
 
-  (issue-deprecation-warning
-   "old balance-sheet is deprecated and will be removed in 5.x")
-
   (gnc:report-starting reportname)
 
   ;; get all option's values
@@ -564,10 +561,9 @@
 (gnc:define-report
  'version 1
  'name reportname
- 'report-guid "c4173ac99b2b448289bf4d11c731af13-old"
+ 'report-guid "c4173ac99b2b448289bf4d11c731af13"
  'menu-path (list gnc:menuname-asset-liability)
  'options-generator balance-sheet-options-generator
- 'renderer balance-sheet-renderer
- 'in-menu? (gnc-prefs-is-extra-enabled))
+ 'renderer balance-sheet-renderer)
 
 ;; END

gnucash/report/reports/standard/balsheet-pnl.scm

@@ -46,6 +46,12 @@
   (split-balance-with-closing col-datum-get-split-balance-with-closing)
   (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
 
@@ -1309,36 +1315,30 @@ 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"))
-(define is-reportname (_ "Income Statement"))
-(define pnl-reportname (_ "Profit & Loss"))
+(define balsheet-reportname (_ "Balance Sheet (Multicolumn)"))
+(define pnl-reportname (_ "Income Statement (Multicolumn)"))
 
 (gnc:define-report
  'version 1
  'name balsheet-reportname
- 'report-guid "c4173ac99b2b448289bf4d11c731af13"
- 'menu-path (list gnc:menuname-asset-liability)
+ 'report-guid "065d5d5a77ba11e8b31e83ada73c5eea"
+ 'menu-path (list gnc:menuname-experimental)
  '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 "8758ba23984c40dea5527f5f0ca2779e"
- 'menu-path (list gnc:menuname-income-expense)
+ 'report-guid "0e94fd0277ba11e8825d43e27232c9d4"
+ 'menu-path (list gnc:menuname-experimental)
  'options-generator (lambda () (multicol-report-options-generator 'pnl))
  'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl)))
 

gnucash/report/reports/standard/income-statement.scm

@@ -291,9 +291,6 @@
      (gnc:lookup-option 
       (gnc:report-options report-obj) pagename optname)))
 
-  (issue-deprecation-warning
-   "old income-statement is deprecated and will be removed in 5.x")
-
   (gnc:report-starting reportname)
   
   ;; get all option's values
@@ -572,8 +569,8 @@
 
     doc))
 
-(define is-reportname "Income Statement (legacy)")
-(define pnl-reportname "Profit & Loss (legacy)")
+(define is-reportname (N_ "Income Statement"))
+(define pnl-reportname (N_ "Profit & Loss"))
 
 (define (income-statement-options-generator)
   (income-statement-options-generator-internal is-reportname))
@@ -589,21 +586,19 @@
 (gnc:define-report 
  'version 1
  'name is-reportname
- 'report-guid "0b81a3bdfd504aff849ec2e8630524bc-old"
+ 'report-guid "0b81a3bdfd504aff849ec2e8630524bc"
  'menu-path (list gnc:menuname-income-expense)
  'options-generator income-statement-options-generator
- 'renderer income-statement-renderer
- 'in-menu? (gnc-prefs-is-extra-enabled))
+ 'renderer income-statement-renderer)
 
 ;; 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-old"
+ 'report-guid "8758ba23984c40dea5527f5f0ca2779e"
  'menu-path (list gnc:menuname-income-expense)
  'options-generator profit-and-loss-options-generator
- 'renderer profit-and-loss-renderer
- 'in-menu? (gnc-prefs-is-extra-enabled))
+ 'renderer profit-and-loss-renderer)
 
 ;; END

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-old")
-(define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc-old")
-(define multicol-balsheet-uuid "c4173ac99b2b448289bf4d11c731af13")
-(define multicol-pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc")
+(define balance-sheet-uuid "c4173ac99b2b448289bf4d11c731af13")
+(define pnl-uuid "0b81a3bdfd504aff849ec2e8630524bc")
+(define multicol-balsheet-uuid "065d5d5a77ba11e8b31e83ada73c5eea")
+(define multicol-pnl-uuid "0e94fd0277ba11e8825d43e27232c9d4")
 
 ;; Explicitly set locale to make the report output predictable
 (setlocale LC_ALL "C")