gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/9f40cac2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5112210e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/06e3fd4d (commit)
	from  https://github.com/Gnucash/gnucash/commit/1a16ba70 (commit)



commit 9f40cac2541195dda848226620c7e1165443af55
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Jul 10 23:07:16 2019 +0800

    [taxinvoice] bugfix: remove option 'Report Currency'
    
    this option is useless; it does not enforce currency conversion, it
    was merely used for "Amount Due, XXX" currency-mnemonic. Remove this
    option, and modify code to use invoice currency instead.

diff --git a/gnucash/report/business-reports/taxinvoice.eguile.scm b/gnucash/report/business-reports/taxinvoice.eguile.scm
index 70d7b491c..ed82b336c 100644
--- a/gnucash/report/business-reports/taxinvoice.eguile.scm
+++ b/gnucash/report/business-reports/taxinvoice.eguile.scm
@@ -423,8 +423,8 @@
     <!-- total row -->
     <tr valign="top">
       <td align="left" class="total" colspan="<?scm:d (+ tbl_cols 1) ?>"><strong>
-        <?scm:d opt-amount-due-heading ?><?scm (if (not (string=? (gnc-commodity-get-mnemonic opt-report-currency) "")) (begin ?>,
-        <?scm:d (gnc-commodity-get-mnemonic opt-report-currency) ?><?scm )) ?></strong></td>
+        <?scm:d opt-amount-due-heading ?><?scm (if (not (string=? (gnc-commodity-get-mnemonic opt-invoice-currency) "")) (begin ?>,
+        <?scm:d (gnc-commodity-get-mnemonic opt-invoice-currency) ?><?scm )) ?></strong></td>
       <td align="right" class="total"><strong><?scm (display-comm-coll-total total-col #f) ?></strong></td>
     </tr>
 
diff --git a/gnucash/report/business-reports/taxinvoice.scm b/gnucash/report/business-reports/taxinvoice.scm
index 58a588ee3..882b91611 100644
--- a/gnucash/report/business-reports/taxinvoice.scm
+++ b/gnucash/report/business-reports/taxinvoice.scm
@@ -91,7 +91,6 @@
 (define optname-row-contact		(N_ "row: Contact"))
 (define optname-row-invoice-number	(N_ "row: Invoice Number"))
 (define optname-row-company-name	(N_ "row: Company Name"))
-(define optname-report-currency		(N_ "Report Currency"))
 (define optname-invoice-number-text	(N_ "Invoice number text"))
 (define optname-to-text			(N_ "To text"))
 (define optname-ref-text		(N_ "Ref text"))
@@ -152,11 +151,6 @@
       "a" "" (lambda () '()) 
       #f))        ;customers-only)) ;-- see above
 
-  (add-option
-    (gnc:make-currency-option
-      gnc:pagename-general optname-report-currency
-      "b" "" (gnc-default-report-currency)))
-
   ;; Elements page options
 (add-option (gnc:make-simple-boolean-option	elementspage	optname-col-date		"a" (N_ "Display the date?") #t))
 (add-option (gnc:make-simple-boolean-option	elementspage	optname-col-taxrate		"b" (N_ "Display the Tax Rate?") #t))
@@ -282,7 +276,7 @@
          (opt-jobname-show          (opt-value elementspage  optname-jobname-show))
          (opt-jobnumber-show        (opt-value elementspage  optname-jobnumber-show))
          (opt-netprice              (opt-value elementspage  optname-netprice))
-         (opt-report-currency       (opt-value gnc:pagename-general optname-report-currency))
+         (opt-invoice-currency      (gncInvoiceGetCurrency opt-invoice))
          (opt-css-border-collapse   (if (opt-value displaypage optname-border-collapse) "border-collapse:collapse;"))
          (opt-css-border-color-th   (opt-value displaypage optname-border-color-th))
          (opt-css-border-color-td   (opt-value displaypage optname-border-color-td))

commit 5112210e4221eaef51a35c35be1151c1f571a8dd
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Jul 10 22:01:13 2019 +0800

    [invoice] Payments should be shown in invoice by default
    
    If an invoice has payments already applied, by default the
    invoice-report should show payments.

diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index 73e53b11c..7b99e1d08 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -344,7 +344,7 @@ for styling the invoice. Please see the exported report for the CSS class names.
   (gnc:register-inv-option
    (gnc:make-simple-boolean-option
     (N_ "Display") (N_ "Payments")
-    "tc" (N_ "Display the payments applied to this invoice?") #f))
+    "tc" (N_ "Display the payments applied to this invoice?") #t))
 
   (gnc:register-inv-option
    (gnc:make-simple-boolean-option

commit 06e3fd4d2812220970c19700c27b82251ff21864
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Jul 7 19:50:46 2019 +0800

    [customer-summary] fix no-owner sorting properly
    
    this comparison now works for no-owner sorting. 3a927ce2a, second
    attempt.

diff --git a/gnucash/report/business-reports/customer-summary.scm b/gnucash/report/business-reports/customer-summary.scm
index 460d999a8..e92b594e8 100644
--- a/gnucash/report/business-reports/customer-summary.scm
+++ b/gnucash/report/business-reports/customer-summary.scm
@@ -434,8 +434,8 @@
               ((customername)
                (lambda (a b)
                  (cond
-                  ((vector-ref b 6) #t)
-                  ((vector-ref a 6) #f)
+                  ((not (vector-ref b 6)) #t)
+                  ((not (vector-ref a 6)) #f)
                   (else (str-op (vector-ref a 0) (vector-ref b 0))))))
               ;; currency sorting always alphabetical a-z
               ((currency)



Summary of changes:
 gnucash/report/business-reports/customer-summary.scm  | 4 ++--
 gnucash/report/business-reports/invoice.scm           | 2 +-
 gnucash/report/business-reports/taxinvoice.eguile.scm | 4 ++--
 gnucash/report/business-reports/taxinvoice.scm        | 8 +-------
 4 files changed, 6 insertions(+), 12 deletions(-)