Merge branch 'maint'

gnucash/report/eguile-utilities.scm

@@ -34,12 +34,13 @@
 (use-modules (gnucash report))
 
 (define-public (fmtnumber n)
+  (issue-deprecation-warning "fmtnumber is deprecated")
   ;; Format a number (integer or real) into something printable
   (number->string (if (integer? n) (inexact->exact n) n)))
 
-;; Format gnc-numeric n with as many decimal places as required
+;; Format gnc-numeric n with decimal places, or exact fraction
 (define-public fmtnumeric
-  (compose fmtnumber exact->inexact))
+  (lambda (n) (xaccPrintAmount n (gnc-default-print-info #f))))
 
 (define (find-internal ftype fname)
   ;; Find the file fname', and return its full path.

gnucash/report/reports/standard/taxinvoice.scm

@@ -58,7 +58,7 @@
                        (gnc:make-gnc-monetary curr amt) #f) acc)))
       (((= gncTaxTableEntryGetAmount percent) . rest)
        (lp rest
-           (cons (string-append (gnc:default-html-number-renderer percent #f) "%")
+           (cons (string-append (fmtnumeric percent) "%")
                  acc))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

gnucash/report/reports/support/receipt.eguile.scm

@@ -176,7 +176,6 @@
           <td align="right"><?scm:d (fmtnumeric qty) ?></td>
           <td align="right"><?scm:d (format #f "~4,2,,,'0f" (gnc-numeric-to-double each)) ?></td>
           <td align="right" nowrap><?scm:d (format #f "~4,2,,,'0f" (gnc-numeric-to-double rval)) ?>
-          <!-- <td align="right" nowrap><?scm:d (fmtnumeric rval) ?> -->
               <?scm (if tax? (begin ?>
                 &nbsp;T
               <?scm ) (begin ?>

gnucash/report/reports/support/taxinvoice.eguile.scm

@@ -298,7 +298,7 @@
       (let* ((inv-total (gncInvoiceGetTotal opt-invoice))
              (tax-total (gncInvoiceGetTotalTax opt-invoice))
              (sub-total (gncInvoiceGetTotalSubtotal opt-invoice))
-             (dsc-total (- inv-total tax-total sub-total))
+             (dsc-total (gnc:make-commodity-collector))
              (total-col (gnc:make-commodity-collector)))
         (total-col 'add currency inv-total)
         (for-each
@@ -314,6 +314,7 @@
                   (acc       (if cust-doc? (gncEntryGetInvAccount entry)(gncEntryGetBillAccount entry)))
                   (taxable   (if cust-doc? (gncEntryGetInvTaxable entry)(gncEntryGetBillTaxable entry)))
                   (taxtable  (if cust-doc? (gncEntryGetInvTaxTable entry)(gncEntryGetBillTaxTable entry))))
+              (dsc-total 'add currency rdiscval)
     ?>
     <tr valign="top">
       <?scm (if opt-col-date (begin ?>
@@ -362,7 +363,7 @@
                     (if (and discount?) 1 0)
         ) ?>"><strong><?scm:d opt-subtotal-heading ?></strong></td>
         <?scm (if discount? (begin ?>
-        <td align="right" class="subtotal"><strong><?scm:d (fmtmoney currency dsc-total) ?></strong></td>
+        <td align="right" class="subtotal"><strong><?scm (display-comm-coll-total dsc-total #f) ?></strong></td>
         <?scm )) ?>
         <?scm (if tax? (begin ?>
           <td align="right" class="subtotal"><strong><?scm:d (fmtmoney currency sub-total) ?></strong></td>

po/glossary/hu.po

@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
 "cgi?product=GnuCash&component=Translations\n"
 "POT-Creation-Date: 2021-12-05 20:11+0100\n"
-"PO-Revision-Date: 2023-02-12 13:38+0000\n"
+"PO-Revision-Date: 2023-02-18 03:36+0000\n"
 "Last-Translator: Szia Tomi <sziatomi01@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/gnucash/"
 "glossary/hu/>\n"
@@ -578,7 +578,7 @@ msgstr "Opciók"
 
 #. "Watch out: Although this word exists in gnucash program code, all that program code in gnucash is currently not activated. In the future, it will be used in business accounting as follows: A particular request to make or supply goods, but belonging to a (larger) job. Such a request can come from a customer or be sent to a vendor. An order will probably generate one invoice or bill."
 msgid "order"
-msgstr "rendelés"
+msgstr "megrendelés"
 
 #. "Name of an automatically created account that holds splits that have no account."
 msgid "orphan"
@@ -753,7 +753,7 @@ msgstr "forrás"
 
 #. "One of the two or several parts a transaction is divided into"
 msgid "split"
-msgstr "felosztás"
+msgstr "rész (tétel)"
 
 #. "Alias of 'shares'"
 msgid "stocks"