gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a13e8f92 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8b1ada60 (commit)
	from  https://github.com/Gnucash/gnucash/commit/e4de6a31 (commit)



commit a13e8f923761ec78aff5e5477dffe01833a09c3d
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Aug 18 13:38:26 2019 +0800

    [general-ledger] deprecate gnc:make-general-ledger-report

diff --git a/gnucash/report/standard-reports/general-ledger.scm b/gnucash/report/standard-reports/general-ledger.scm
index 521b89263..ffd0a3b11 100644
--- a/gnucash/report/standard-reports/general-ledger.scm
+++ b/gnucash/report/standard-reports/general-ledger.scm
@@ -30,7 +30,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-module (gnucash report standard-reports general-ledger))
-(export gnc:make-general-ledger-report)
+(export gnc:make-general-ledger-report) ;deprecated
 (use-modules (gnucash utilities)) 
 (use-modules (gnucash gnc-module))
 (use-modules (gnucash gettext))
@@ -45,6 +45,7 @@
 ;; report constructor
 
 (define (gnc:make-general-ledger-report)
+  (issue-deprecation-warning "gnc:make-general-ledger-report is unused")
   (let* ((xactrpt (gnc:make-report xactrptguid)))
     xactrpt))
 

commit 8b1ada6048b5c2ada16140bac632dc475631672f
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Aug 18 00:16:55 2019 +0800

    [balsheet-eguile] monetaries must be rounded to their scu
    
    previously balsheet-eguile would convert monetaries to exact fractions.

diff --git a/gnucash/report/business-reports/balsheet-eg.scm b/gnucash/report/business-reports/balsheet-eg.scm
index ccec8c5ae..928512a8b 100644
--- a/gnucash/report/business-reports/balsheet-eg.scm
+++ b/gnucash/report/business-reports/balsheet-eg.scm
@@ -565,6 +565,12 @@
           (negstyle (nbsp mny-string)))
         (nbsp mny-string)))
 
+    (define (monetary-rounded mon)
+      (let ((c (gnc:gnc-monetary-commodity mon))
+            (a (gnc:gnc-monetary-amount mon)))
+        (gnc:make-gnc-monetary
+         c (gnc-numeric-convert a (gnc-commodity-get-fraction c) GNC-RND-ROUND))))
+
     (define (format-monetary mny)
       ;; Format the given gnc:monetary value according to opt-neg-format
       ;; If mny's currency isn't the same as that of the report,
@@ -578,10 +584,10 @@
         (if (not (gnc-commodity-equiv comm opt-report-commodity))
           (begin
             (if opt-show-foreign?
-              (set! answer (string-append (foreignstyle (neg-format (gnc:monetary->string mny) neg?)) " ")))
+              (set! answer (string-append (foreignstyle (neg-format (gnc:monetary->string (monetary-rounded mny)) neg?)) " ")))
             (set! mny (exchange-fn mny opt-report-commodity))))
         ; main currency - converted if necessary
-        (set! answer (string-append answer (neg-format (gnc:monetary->string mny) neg?)))
+        (set! answer (string-append answer (neg-format (gnc:monetary->string (monetary-rounded mny)) neg?)))
         answer))
 
     (define (format-comm-coll cc)
@@ -600,7 +606,7 @@
     (define (fmtmoney2 mny)
       ;; format a monetary amount in the given currency/commodity
       ;; !! this takes a gnc-monetary
-      (nbsp (gnc:monetary->string mny)))
+      (nbsp (gnc:monetary->string (monetary-rounded mny))))
 
     ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 



Summary of changes:
 gnucash/report/business-reports/balsheet-eg.scm    | 12 +++++++++---
 gnucash/report/standard-reports/general-ledger.scm |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)