Bug 773200 - Rename Sample & Custom Report Group

Technically the sample & custom group hasn't been changed yet,
in this commit the two relevant reports are moved to a new
'Multicolumn' submenu

gnucash/report/report-gnome/report-gnome.scm

@@ -29,7 +29,7 @@
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gnome-utils))
 (use-modules (gnucash gettext))
-(use-modules (gnucash report reports sample dashboard))
+(use-modules (gnucash report reports standard dashboard))
 
 (eval-when (compile load eval expand)
   (load-extension "libgncmod-gnome-utils" "scm_init_sw_gnome_utils_module")
@@ -37,7 +37,7 @@
 (use-modules (sw_report_gnome))
 
 (gnc:module-load "gnucash/gnome-utils" 0)
-(gnc:module-load "gnucash/report/report-system" 0)
+(gnc:module-begin-syntax (gnc:module-load "gnucash/report/report-system" 0))
 
 (export gnc:report-menu-setup)
 (export gnc:add-report-template-menu-items)
@@ -81,6 +81,8 @@
     (gnc:make-menu gnc:menuname-utility (list gnc:menuname-reports)))
   (define experimental-menu
     (gnc:make-menu gnc:menuname-experimental (list gnc:menuname-reports)))
+  (define multicolumn-menu
+    (gnc:make-menu gnc:menuname-multicolumn (list gnc:menuname-reports)))
   (define tax-menu
     (gnc:make-menu gnc:menuname-taxes (list gnc:menuname-reports)))
   (define business-menu
@@ -102,6 +104,7 @@
   (gnc-add-scm-extension budget-menu)
   (gnc-add-scm-extension utility-menu)
   (gnc-add-scm-extension experimental-menu)
+  (gnc-add-scm-extension multicolumn-menu)
   (gnc-add-scm-extension business-menu)
 
   ;; run report-hook danglers
@@ -116,6 +119,6 @@
     (N_ "Dashboard")
     "ad80271c890b11dfa79f2dcedfd72085"
     (N_ "A basic dashboard for your accounting data")
-    (list gnc:menuname-reports gnc:menuname-utility "")
+    (list gnc:menuname-reports gnc:menuname-multicolumn "")
     (lambda (window)
       (gnc-main-window-open-report (gnc:make-dashboard) window)))))

gnucash/report/report-system/report-system.scm

@@ -137,6 +137,7 @@
 (export gnc:menuname-budget)
 (export gnc:menuname-taxes)
 (export gnc:menuname-utility)
+(export gnc:menuname-multicolumn)
 (export gnc:menuname-experimental)
 (export gnc:menuname-custom)
 (export gnc:menuname-business-reports)

gnucash/report/report-system/report.scm

@@ -64,6 +64,7 @@
 (define gnc:menuname-taxes (N_ "_Taxes"))
 (define gnc:menuname-utility (N_ "_Sample & Custom"))
 (define gnc:menuname-experimental (N_ "_Experimental"))
+(define gnc:menuname-multicolumn (N_ "_Multicolumn"))
 (define gnc:menuname-custom (N_ "_Custom"))
 (define gnc:pagename-general (N_ "General"))
 (define gnc:pagename-accounts (N_ "Accounts"))

gnucash/report/reports/CMakeLists.txt

@@ -27,6 +27,7 @@ set (reports_standard_SCHEME
     standard/cashflow-barchart.scm
     standard/category-barchart.scm
     standard/daily-reports.scm
+    standard/dashboard.scm
     standard/equity-statement.scm
     standard/general-journal.scm
     standard/general-ledger.scm
@@ -40,6 +41,7 @@ set (reports_standard_SCHEME
     standard/sx-summary.scm
     standard/transaction.scm
     standard/trial-balance.scm
+    standard/view-column.scm
     standard/customer-summary.scm
     standard/taxinvoice.scm
     standard/receipt.scm
@@ -52,9 +54,7 @@ set (reports_standard_SCHEME
     )
 
 set(reports_sample_SCHEME
-  sample/dashboard.scm
   sample/hello-world.scm
-  sample/view-column.scm
   sample/welcome-to-gnucash.scm
 )
 

gnucash/report/reports/standard/dashboard.scm

@@ -22,7 +22,7 @@
 ;; Boston, MA  02110-1301,  USA       gnu@gnu.org
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-module (gnucash report reports sample dashboard))
+(define-module (gnucash report reports standard dashboard))
 (export gnc:make-dashboard)
 
 (use-modules (gnucash utilities))

gnucash/report/reports/standard/view-column.scm

@@ -26,7 +26,7 @@
 ;; edited in a special window.  Every view gets a stylesheet so we
 ;; don't have to worry about that here.
 
-(define-module (gnucash report reports sample view-column))
+(define-module (gnucash report reports standard view-column))
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash app-utils))
 (use-modules (gnucash gnc-module))
@@ -243,7 +243,7 @@
  'name (N_ "Multicolumn View")
  'report-guid "d8ba4a2e89e8479ca9f6eccdeb164588"
  'menu-name (N_ "Custom Multicolumn Report")
- 'menu-path (list gnc:menuname-utility)
+ 'menu-path (list gnc:menuname-multicolumn)
  'renderer render-view
  'options-generator make-options
  'options-cleanup-cb cleanup-options 

po/POTFILES.in

@@ -425,9 +425,7 @@ gnucash/report/report-gnome/report-gnome.scm
 gnucash/report/report-gnome/window-report.c
 gnucash/report/reports/aging.scm
 gnucash/report/reports/reports.scm
-gnucash/report/reports/sample/dashboard.scm
 gnucash/report/reports/sample/hello-world.scm
-gnucash/report/reports/sample/view-column.scm
 gnucash/report/reports/sample/welcome-to-gnucash.scm
 gnucash/report/reports/standard/account-piecharts.scm
 gnucash/report/reports/standard/account-summary.scm
@@ -447,6 +445,7 @@ gnucash/report/reports/standard/cash-flow.scm
 gnucash/report/reports/standard/category-barchart.scm
 gnucash/report/reports/standard/customer-summary.scm
 gnucash/report/reports/standard/daily-reports.scm
+gnucash/report/reports/standard/dashboard.scm
 gnucash/report/reports/standard/equity-statement.scm
 gnucash/report/reports/standard/general-journal.scm
 gnucash/report/reports/standard/general-ledger.scm
@@ -467,6 +466,7 @@ gnucash/report/reports/standard/sx-summary.scm
 gnucash/report/reports/standard/taxinvoice.scm
 gnucash/report/reports/standard/transaction.scm
 gnucash/report/reports/standard/trial-balance.scm
+gnucash/report/reports/standard/view-column.scm
 gnucash/report/reports/support/balsheet-eg.eguile.scm
 gnucash/report/reports/support/receipt.eguile.scm
 gnucash/report/reports/support/taxinvoice.eguile.scm