gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1999d853 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/604a2d08 (commit)
	from  https://github.com/Gnucash/gnucash/commit/3aba4d2d (commit)



commit 1999d85343496eca0ec5f54c64468ff83ad99424
Merge: 3aba4d2 604a2d0
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Feb 15 10:30:42 2018 -0800

    Merge Chris Lam's 'maint-fix-45f61a3'.


commit 604a2d0864dbdd2b82fa8b66b959e2639042d7e9
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Feb 14 17:15:26 2018 +0800

    Bugfix create-commodity-list
    
    45f61a3 had couple bugs.
    - value/share was inadvertently swapped
    - no need to define comm-list in
      create-commodity-list to return it

diff --git a/src/report/report-system/commodity-utilities.scm b/src/report/report-system/commodity-utilities.scm
index ceca9c8..ee0eaf1 100644
--- a/src/report/report-system/commodity-utilities.scm
+++ b/src/report/report-system/commodity-utilities.scm
@@ -543,7 +543,7 @@
                           (gnc:make-numeric-collector)))))
     ((caadr pair) 'add value-amount)
     ((cdadr pair) 'add share-amount)
-    (set comm-list (list outer-comm (list pair)))))
+    (list outer-comm (list pair))))
 
 (define (create-foreign-list comm-list transaction-comm account-comm
                              share-amount value-amount)
@@ -616,7 +616,7 @@
                  (begin
                    (set! comm-list (create-commodity-list
                                     account-comm transaction-comm
-                                    share-amount value-amount))
+                                    value-amount share-amount))
                    (set! sumlist (cons comm-list sumlist)))
 
                  ;;yes, check for second commodity



Summary of changes:
 src/report/report-system/commodity-utilities.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)