Merge branch 'maint'

This commit is contained in:
Frank H. Ellenberger 2023-01-10 03:14:05 +01:00
commit 73e18b9619
3 changed files with 30 additions and 36 deletions

View File

@ -47,13 +47,6 @@
(split-balance-with-closing col-datum-get-split-balance-with-closing)
(split-value-balance col-datum-get-split-value-balance))
(define FOOTER-TEXT
(gnc:make-html-text
(G_ "WARNING: Foreign currency conversions, and unrealized gains
calculations are not confirmed correct. This report may be modified
without notice. Bug reports are very welcome at
https://bugs.gnucash.org/")))
;; define all option's names and help text so that they are properly
(define optname-startdate (N_ "Start Date"))
@ -743,11 +736,17 @@ also show overall period profit & loss."))
(cons acc (map col-datum-get-split-balance-with-closing cols-data))))
accounts-cols-data))
(exchange-fn (and common-currency
(gnc:case-exchange-time-fn
price-source common-currency
(map xaccAccountGetCommodity accounts) enddate
#f #f)))
;; generate an exchange-fn for date, and cache its result.
(get-date-exchange-fn
(let ((h (make-hash-table)))
(lambda (date)
(or (hashv-ref h date)
(let ((exchangefn (gnc:case-exchange-time-fn
price-source common-currency
(map xaccAccountGetCommodity accounts)
date #f #f)))
(hashv-set! h date exchangefn)
exchangefn)))))
;; from col-idx, find effective date to retrieve pricedb
;; entry or to limit transactions to calculate average-cost
@ -773,9 +772,9 @@ also show overall period profit & loss."))
(gnc:gnc-monetary-commodity monetary)
common-currency))
(has-price? (gnc:gnc-monetary-commodity monetary))
(exchange-fn
monetary common-currency
(col-idx->price-date col-idx)))))
(let* ((col-date (col-idx->price-date col-idx))
(exchange-fn (get-date-exchange-fn col-date)))
(exchange-fn monetary common-currency col-date)))))
;; the following function generates an gnc:html-text object
;; to dump exchange rate for a particular column. From the
@ -1253,9 +1252,6 @@ also show overall period profit & loss."))
(gnc:html-document-add-object!
doc multicol-table))
(gnc:html-document-add-object!
doc FOOTER-TEXT)
(gnc:report-finished)
;; (gnc:html-document-set-style-text!
;; doc " table, td{ border-width: 1px; border-style:solid; border-color: lightgray; border-collapse: collapse}")
@ -1268,7 +1264,7 @@ also show overall period profit & loss."))
'version 1
'name balsheet-reportname
'report-guid "065d5d5a77ba11e8b31e83ada73c5eea"
'menu-path (list gnc:menuname-experimental)
'menu-path (list gnc:menuname-asset-liability)
'options-generator (lambda () (multicol-report-options-generator 'balsheet))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'balsheet)))
@ -1276,7 +1272,7 @@ also show overall period profit & loss."))
'version 1
'name pnl-reportname
'report-guid "0e94fd0277ba11e8825d43e27232c9d4"
'menu-path (list gnc:menuname-experimental)
'menu-path (list gnc:menuname-income-expense)
'options-generator (lambda () (multicol-report-options-generator 'pnl))
'renderer (lambda (rpt) (multicol-report-renderer rpt 'pnl)))

View File

@ -1,7 +1,7 @@
# Italian translation for GnuCash package (Glossary)
# Copyright (C) 2020 Giuseppe Foti <foti.giuseppe@gmail.com>.
# This file is distributed under the same license as the GnuCash package.
# Giuseppe Foti <foti.giuseppe@gmail.com>, 2020, 2021.
# Giuseppe Foti <foti.giuseppe@gmail.com>, 2020, 2021, 2023.
# Cristian Marchi <cri79@libero.it>, 2008;
# Lorenzo Cappelletti <lorenzo.cappelletti@email.it>, 2003;
# Lorenzo Cappelletti <L.Cappelletti@mail.com>, 2002 2003;
@ -18,11 +18,11 @@
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.8\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"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: 2022-01-02 22:54+0000\n"
"Last-Translator: Anonymous <noreply@weblate.org>\n"
"PO-Revision-Date: 2023-01-09 07:49+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe@gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/glossary/"
"it/>\n"
"Language: it\n"
@ -30,7 +30,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.10.1\n"
"X-Generator: Weblate 4.15.1-dev\n"
#. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
msgid "Term (Dear translator: This file will never be visible to the user!)"
@ -894,4 +894,4 @@ msgid "Online"
msgstr ""
msgid "Direct Debit"
msgstr ""
msgstr "Addebito diretto"

View File

@ -1,7 +1,7 @@
# Italian translation of Gnucash.
# Copyright (C) 2020 by the GnuCash developers and the translators below.
# This file is distributed under the same license as the Gnucash package.
# Giuseppe Foti <foti.giuseppe@gmail.com>, 2020;, 2021, 2022.
# Giuseppe Foti <foti.giuseppe@gmail.com>, 2020;, 2021, 2022, 2023.
# Cristian Marchi <cri79@libero.it>, 2008, 2009, 2010;
# Simone Zinanni <simone@develer.com>, 2008;
# Lorenzo Cappelletti <lorenzo.cappelletti@email.com>, 2003-2005.
@ -52,10 +52,10 @@
msgid ""
msgstr ""
"Project-Id-Version: GnuCash 4.13-pre1\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
"product=GnuCash&component=Translations\n"
"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
"cgi?product=GnuCash&component=Translations\n"
"POT-Creation-Date: 2022-12-04 19:47-0800\n"
"PO-Revision-Date: 2022-09-08 09:22+0000\n"
"PO-Revision-Date: 2023-01-09 07:49+0000\n"
"Last-Translator: Giuseppe Foti <foti.giuseppe@gmail.com>\n"
"Language-Team: Italian <https://hosted.weblate.org/projects/gnucash/gnucash/"
"it/>\n"
@ -64,7 +64,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1-dev\n"
"X-Generator: Weblate 4.15.1-dev\n"
#: borrowed/goffice/go-charmap-sel.c:70
msgid "Arabic"
@ -2745,8 +2745,6 @@ msgid "Empty"
msgstr "Vuoto"
#: gnucash/gnome/dialog-lot-viewer.c:829
#, fuzzy
#| msgid "Open"
msgctxt "Adjective"
msgid "Open"
msgstr "Aperto"
@ -9253,7 +9251,7 @@ msgstr "Contabilità delle finanze personali e per piccole imprese."
#: gnucash/gnome-utils/gnc-main-window.c:4954
msgid "translator-credits"
msgstr ""
"Giuseppe Foti (2020, 2021, 2022)\n"
"Giuseppe Foti (2020, 2021, 2022, 2023)\n"
"Cristian Marchi (2008, 2009, 2010, 2014)\n"
"Simone Zinanni (2008)\n"
"Lorenzo Cappelletti (2002, 2003-2005)\n"
@ -22422,7 +22420,7 @@ msgstr "Disabilitato"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1317
msgid "_Assign a transfer account to the selection"
msgstr "_Assegnare un conto di trasferimento alla selezione."
msgstr "_Assegna un conto di trasferimento alla selezione"
#. Translators: Menu entry, no full stop
#: gnucash/import-export/import-main-matcher.c:1368