gnucash stable: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/42dc3bf2 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/dd8bd2fe (commit)
	from  https://github.com/Gnucash/gnucash/commit/0de89eec (commit)



commit 42dc3bf203061cabedab2b712fb00196dae4409e
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Aug 16 16:53:50 2026 +0800

    [stylesheets/footer.scm] add markup "stylesheet-footer" to footer
    
    to allow easier css styling

diff --git a/gnucash/report/stylesheets/footer.scm b/gnucash/report/stylesheets/footer.scm
index c46d7ede56..a832074ddd 100644
--- a/gnucash/report/stylesheets/footer.scm
+++ b/gnucash/report/stylesheets/footer.scm
@@ -372,7 +372,7 @@
 
       (gnc:html-table-set-cell!
        t 3 headcolumn
-       (gnc:make-html-text footer-text)))
+       (gnc:make-html-div/markup "stylesheet-footer" (gnc:make-html-text footer-text))))
     ssdoc))
 
 (gnc:define-html-style-sheet

commit dd8bd2fe6a353afc6d921bb99b2329843786ebd4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Aug 16 16:53:27 2026 +0800

    Bug 799772 - Invoice layout: footer should span both columns and header tables should be easier to align/style
    
    main-table should have all cells span 2 columns to ease alignment

diff --git a/gnucash/report/reports/standard/invoice.scm b/gnucash/report/reports/standard/invoice.scm
index babc670a9a..36721c7b4a 100644
--- a/gnucash/report/reports/standard/invoice.scm
+++ b/gnucash/report/reports/standard/invoice.scm
@@ -840,10 +840,11 @@ for styling the invoice. Please see the exported report for the CSS class names.
                   (if (and name (not (string-null? name)))
                       (gnc:html-table-append-row!
                        main-table
-                       (gnc:make-html-div/markup
-                        "invoice-footer-payable-to"
-                        (multiline-to-html-text
-                         (string-append name-str ": " name)))))))
+                       (gnc:make-html-table-cell/size
+                        1 2 (gnc:make-html-div/markup
+                             "invoice-footer-payable-to"
+                             (multiline-to-html-text
+                              (string-append name-str ": " name))))))))
 
             (if (opt-val "Display" "Company contact")
                 (let* ((contact (gnc:company-info book gnc:*company-contact*))
@@ -851,10 +852,11 @@ for styling the invoice. Please see the exported report for the CSS class names.
                   (if (and contact (not (string-null? contact)))
                       (gnc:html-table-append-row!
                        main-table
-                       (gnc:make-html-div/markup
-                        "invoice-footer-company-contact"
-                        (multiline-to-html-text
-                         (string-append contact-str  ": " contact)))))))
+                       (gnc:make-html-table-cell/size
+                        1 2 (gnc:make-html-div/markup
+                             "invoice-footer-company-contact"
+                             (multiline-to-html-text
+                              (string-append contact-str  ": " contact))))))))
 
             (gnc:html-table-append-row! main-table
                                         (gnc:make-html-table-cell/size



Summary of changes:
 gnucash/report/reports/standard/invoice.scm | 18 ++++++++++--------
 gnucash/report/stylesheets/footer.scm       |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)