gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/26718142 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1ab95b55 (commit)
	from  https://github.com/Gnucash/gnucash/commit/eea5ac98 (commit)



commit 267181425178bea6fc160bbf6e60687fcae298ca
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Nov 20 21:00:14 2019 +0800

    [balsheet-pnl] income statement parent account can link to TR
    
    this commit modifies the recursive-parent subtotal generator to also
    include a link to a transaction report with all relevant accounts.

diff --git a/gnucash/report/standard-reports/balsheet-pnl.scm b/gnucash/report/standard-reports/balsheet-pnl.scm
index 8d06801b1..0a6d618a7 100644
--- a/gnucash/report/standard-reports/balsheet-pnl.scm
+++ b/gnucash/report/standard-reports/balsheet-pnl.scm
@@ -573,7 +573,10 @@ also show overall period profit & loss."))
                                                     col-datum
                                                     #t)
                                col-datum
-                               #f)))
+                               (and get-cell-anchor-fn
+                                    (get-cell-anchor-fn
+                                     (account-and-descendants lvl-acct)
+                                     col-datum)))))
                            cols-data))))
 
   (define* (add-account-row lvl-curr curr #:key
@@ -903,13 +906,14 @@ also show overall period profit & loss."))
                        (list-ref account-balance-list (1+ col-idx))))))
              (get-cell-anchor-fn
               (lambda (account col-idx)
-                (let* ((splits (xaccAccountGetSplitList account))
-                       (split-date (compose xaccTransGetDate xaccSplitGetParent))
-                       (date (list-ref report-dates col-idx))
-                       (valid-split? (lambda (s) (< (split-date s) date)))
-                       (valid-splits (filter valid-split? splits)))
-                  (and (pair? valid-splits)
-                       (gnc:split-anchor-text (last valid-splits))))))
+                (and (not (pair? account))
+                     (let* ((splits (xaccAccountGetSplitList account))
+                            (split-date (compose xaccTransGetDate xaccSplitGetParent))
+                            (date (list-ref report-dates col-idx))
+                            (valid-split? (lambda (s) (< (split-date s) date)))
+                            (valid-splits (filter valid-split? splits)))
+                       (and (pair? valid-splits)
+                            (gnc:split-anchor-text (last valid-splits)))))))
 
              (asset-liability-balances
               (let ((asset-liab-balances
@@ -1149,7 +1153,9 @@ also show overall period profit & loss."))
                                            (or common-currency book-main-currency))
                                      (list "Display" "Amount" 'double)
                                      (list "Accounts" "Accounts"
-                                           (list account))))))
+                                           (if (pair? account)
+                                               account
+                                               (list account)))))))
 
              (chart (and include-chart?
                          (gnc:make-report-anchor

commit 1ab95b5563d3de766f1680d6aac60b2fedfb7833
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Nov 20 00:13:42 2019 +0800

    [invoice][i18n] enable i18n options helptext
    
    and remove obsolete options "My Company" and "My Company ID"

diff --git a/gnucash/report/business-reports/invoice.scm b/gnucash/report/business-reports/invoice.scm
index af4e29fb4..0beef5c12 100644
--- a/gnucash/report/business-reports/invoice.scm
+++ b/gnucash/report/business-reports/invoice.scm
@@ -207,13 +207,13 @@
 
   (gnc:register-inv-option
    (gnc:make-text-option
-    (N_ "Layout") (N_ "CSS") "zz" "CSS code. This field specifies the CSS code
-for styling the invoice. Please see the exported report for the CSS class names."
+    (N_ "Layout") (N_ "CSS") "zz" (N_ "CSS code. This field specifies the CSS code \
+for styling the invoice. Please see the exported report for the CSS class names.")
     (keylist-get-info variant-list variant 'css)))
 
   (gnc:register-inv-option
    (gnc:make-pixmap-option
-    (N_ "Layout") (N_ "Picture Location") "zy" "Location for Picture"
+    (N_ "Layout") (N_ "Picture Location") "zy" (N_ "Location for Picture")
     ""))
 
   (gnc:register-inv-option
@@ -261,11 +261,6 @@ for styling the invoice. Please see the exported report for the CSS class names.
     (N_ "Display Columns") (N_ "Total")
     "n" (N_ "Display the entry's value?") #t))
 
-  ;; company details can now be toggled via Layout tab
-  ;; and IMHO company-tax-id should be rendered if present
-  (gnc:register-inv-option (gnc:make-internal-option "Display" "My Company" #f))
-  (gnc:register-inv-option (gnc:make-internal-option "Display" "My Company ID" #f))
-
   (gnc:register-inv-option
    (gnc:make-simple-boolean-option
     (N_ "Display") (N_ "Due Date")
diff --git a/gnucash/report/business-reports/test/test-invoice.scm b/gnucash/report/business-reports/test/test-invoice.scm
index d6a3588b4..04cfffe5b 100644
--- a/gnucash/report/business-reports/test/test-invoice.scm
+++ b/gnucash/report/business-reports/test/test-invoice.scm
@@ -105,9 +105,8 @@
         (for-each
          (lambda (disp-col-name)
            (set-option! options "Display" disp-col-name setting))
-         '("My Company" "My Company ID" "Due Date"
-           "Use Detailed Tax Summary" "Totals" "Subtotal" "References"
-           "Billing Terms" "Billing ID" "Invoice Notes"
+         '("Due Date" "Use Detailed Tax Summary" "Totals" "Subtotal"
+           "References" "Billing Terms" "Billing ID" "Invoice Notes"
            "Payments" "Job Details"))
         options))
 



Summary of changes:
 gnucash/report/business-reports/invoice.scm        | 11 +++-------
 .../report/business-reports/test/test-invoice.scm  |  5 ++---
 gnucash/report/standard-reports/balsheet-pnl.scm   | 24 ++++++++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)