IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge maint

Browse Source
This commit is contained in:
Geert Janssens
2019-08-17 12:53:55 +02:00
parent d1fddf557c e4de6a3198
commit 0e93e95c6c
29 changed files with 26373 additions and 25745 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@@ -1,5 +1,4 @@
# Test
sudo: required
language: c++
compiler: gcc
env:

8
CMakeLists.txt
View File

@@ -45,6 +45,7 @@ include (GncAddTest)
include (MakeDistFiles)
include (GNUInstallDirs)
include (TestBigEndian)
include (CheckSymbolExists)
# ############################################################
# These options are settable from the CMake command line. For example, to disable
@@ -362,6 +363,13 @@ find_guile_dirs()
if (WITH_AQBANKING)
pkg_check_modules (GWENHYWFAR REQUIRED gwenhywfar>=4.9.99)
pkg_check_modules (AQBANKING REQUIRED aqbanking>=5.3.4)
set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}"
"${GWENHYWFAR_INCLUDE_DIRS}")
set(CMAKE_REQUIRED_LIBRARIES "-laqbanking")
check_symbol_exists("AB_Banking_RuntimeConfig_SetCharValue"
"aqbanking/banking.h" AQB_HAS_RUNTIME_CONFIG)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
if(WITH_GNUCASH)
pkg_check_modules (GWEN_GTK3 gwengui-gtk3)
if(GWEN_GTK3_FOUND AND GWEN_GTK3_VERSION VERSION_GREATER "4.20.0")

5
common/cmake_modules/GncAddTest.cmake
View File

@@ -143,7 +143,10 @@ function(gnc_gtest_configure)
set(GTEST_LIB "${GTEST_MAIN_LIB};${GTEST_SHARED_LIB}" PARENT_SCOPE)
unset(GTEST_SRC_DIR CACHE)
else()
set(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
set(lib_gtest_SOURCES
"${GTEST_SRC_DIR}/src/gtest_main.cc"
"${GTEST_SRC_DIR}/src/gtest-all.cc"
PARENT_SCOPE)
set(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
endif()
else()

3
common/config.h.cmake.in
View File

@@ -363,6 +363,9 @@
#cmakedefine WEBKIT2_3 1
#cmakedefine WEBKIT1 1
/* Definition for AQBanking Runtime Config feature */
#cmakedefine AQB_HAS_RUNTIME_CONFIG 1
/* Definitions for all OS */
/* From cutecash */
//#define HAVE_LIBQOF /**/

3
common/test-core/CMakeLists.txt
View File

@@ -73,7 +73,8 @@ gnc_add_scheme_deprecated_module ("gnucash unittest-support" "tests unittest-sup
if(NOT GTEST_SHARED_LIB)
set (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
# in contrast to GoogleTest build system libraries libgtest.a and libgtest_main.a
# are combined to one library libtest.a here
add_library(gtest STATIC ${lib_gtest_SOURCES})
if(APPLE)
target_compile_options(gtest PRIVATE -Wno-missing-prototypes)

2
data/accounts/nl/acctchrt_rgs_1.1.gnucash-xea
View File

@@ -24609,7 +24609,7 @@
<act:parent type="new">b37b684d8e8a4472abfdffdf41e2901a</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Zakelijke verhuiskosten: kosten overbrenging boedel</act:name>
<act:name>Zakelijke verhuiskosten - kosten overbrenging boedel</act:name>
<act:id type="new">45326480387a43739a8671874670cd4b</act:id>
<act:type>EXPENSE</act:type>
<act:commodity>

2
gnucash/import-export/aqb/assistant-ab-initial.glade
View File

@@ -141,7 +141,7 @@ Click on "Next" to proceed or "Cancel" to Abort Import.</property>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>

4
gnucash/import-export/aqb/gnc-ab-utils.c
View File

@@ -159,13 +159,13 @@ gnc_AB_BANKING_new(void)
api = AB_Banking_new("gnucash", NULL, 0);
g_return_val_if_fail(api, NULL);
#if AQBANKING_VERSION_INT >= 59925
#if AQB_HAS_RUNTIME_CONFIG
/* These two values must be set because newest bank regulation requires
the bank servers to require it. The string itself results from our
registration with the German bank association at
https://www.hbci-zka.de/register/prod_register.htm (where the
registration was requested and is managed by cstim). The function call was
introduced in aqbanking-5.99.25. */
introduced in aqbanking-5.99.25 and aqbanking-5.7.9. */
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsRegistrationKey", "412748A1836CDD07181CE1910");
AB_Banking_RuntimeConfig_SetCharValue(api, "fintsApplicationVersionString", PACKAGE_VERSION);
#endif

44
gnucash/import-export/bi-import/dialog-bi-import-gui.c
View File

@@ -137,30 +137,30 @@ gnc_plugin_bi_import_showGUI (GtkWindow *parent)
column = gtk_tree_view_column_new_with_attributes (description, renderer, "text", column_id, NULL); \
gtk_tree_view_column_set_resizable (column, TRUE); \
gtk_tree_view_append_column (GTK_TREE_VIEW (gui->tree_view), column);
CREATE_COLUMN (_("id"), ID);
CREATE_COLUMN (_("date__opened"), DATE_OPENED);
CREATE_COLUMN (_("owner__id"), OWNER_ID);
CREATE_COLUMN (_("billing__id"), BILLING_ID);
CREATE_COLUMN (_("notes"), NOTES);
CREATE_COLUMN (_("ID"), ID);
CREATE_COLUMN (_("Date-opened"), DATE_OPENED);
CREATE_COLUMN (_("Owner-ID"), OWNER_ID);
CREATE_COLUMN (_("Billing-ID"), BILLING_ID);
CREATE_COLUMN (_("Notes"), NOTES);
CREATE_COLUMN (_("date"), DATE);
CREATE_COLUMN (_("desc"), DESC);
CREATE_COLUMN (_("action"), ACTION);
CREATE_COLUMN (_("account"), ACCOUNT);
CREATE_COLUMN (_("quantity"), QUANTITY);
CREATE_COLUMN (_("price"), PRICE);
CREATE_COLUMN (_("disc__type"), DISC_TYPE);
CREATE_COLUMN (_("disc__how"), DISC_HOW);
CREATE_COLUMN (_("discount"), DISCOUNT);
CREATE_COLUMN (_("taxable"), TAXABLE);
CREATE_COLUMN (_("taxincluded"), TAXINCLUDED);
CREATE_COLUMN (_("tax__table"), TAX_TABLE);
CREATE_COLUMN (_("Date"), DATE);
CREATE_COLUMN (_("Description"), DESC);
CREATE_COLUMN (_("Action"), ACTION);
CREATE_COLUMN (_("Account"), ACCOUNT);
CREATE_COLUMN (_("Quantity"), QUANTITY);
CREATE_COLUMN (_("Price"), PRICE);
CREATE_COLUMN (_("Disc-type"), DISC_TYPE);
CREATE_COLUMN (_("Disc-how"), DISC_HOW);
CREATE_COLUMN (_("Discount"), DISCOUNT);
CREATE_COLUMN (_("Taxable"), TAXABLE);
CREATE_COLUMN (_("Taxincluded"), TAXINCLUDED);
CREATE_COLUMN (_("Tax-table"), TAX_TABLE);
CREATE_COLUMN (_("date__posted"), DATE_POSTED);
CREATE_COLUMN (_("due__date"), DUE_DATE);
CREATE_COLUMN (_("account__posted"), ACCOUNT_POSTED);
CREATE_COLUMN (_("memo__posted"), MEMO_POSTED);
CREATE_COLUMN (_("accu__splits"), ACCU_SPLITS);
CREATE_COLUMN (_("Date-posted"), DATE_POSTED);
CREATE_COLUMN (_("Due-date"), DUE_DATE);
CREATE_COLUMN (_("Account-posted"), ACCOUNT_POSTED);
CREATE_COLUMN (_("Memo-posted"), MEMO_POSTED);
CREATE_COLUMN (_("Accu-splits"), ACCU_SPLITS);
gui->component_id = gnc_register_gui_component ("dialog-bi-import-gui",
NULL,

6
gnucash/import-export/csv-imp/test/CMakeLists.txt
View File

@@ -19,15 +19,13 @@ if (NOT WIN32)
${GTEST_INCLUDE_DIR})
set(test_tokenizer_SOURCES
test-tokenizer.cpp
${GTEST_SRC})
test-tokenizer.cpp)
gnc_add_test(test-tokenizer "${test_tokenizer_SOURCES}"
gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS
SRCDIR=${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp/test)
set(test_tx_import_SOURCES
test-tx-import.cpp
${GTEST_SRC})
test-tx-import.cpp)
gnc_add_test(test-tx_import "${test_tx_import_SOURCES}"
gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS)
endif()

6
gnucash/import-export/qif-imp/qif-parse.scm
View File

@@ -149,7 +149,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define (qif-parse:parse-bang-field read-value)
(let ((bang-field (string-downcase! (string-trim read-value))))
(let ((bang-field (string-downcase! (string-trim-right read-value))))
;; The QIF files output by the WWW site of Credit Lyonnais
;; begin by: !type bank
;; instead of: !Type:bank
@@ -235,8 +235,8 @@
(define (date? d m y ys)
(and (number? d) (<= 1 d 31)
(number? m) (<= 1 m 12)
(= 4 (string-length ys))
(number? y) (> y 1930)))
(number? y) (or (not (= 4 (string-length ys)))
(> y 1930))))
(let* ((date-parts (list (match:substring match 1)
(match:substring match 2)
(match:substring match 3)))

25
gnucash/import-export/qif-imp/test/test-qif-parse.scm
View File

@@ -157,6 +157,18 @@
"1979/03/03"
'(d-m-y y-m-d m-d-y y-d-m)))
(test-equal "qif-parse:check-date-format 03/03/79"
'(d-m-y m-d-y)
(qif-parse:check-date-format
"03/03/79"
'(d-m-y y-m-d m-d-y y-d-m)))
(test-equal "qif-parse:check-date-format 03121984"
'(d-m-y m-d-y)
(qif-parse:check-date-format
"03121984"
'(d-m-y y-m-d m-d-y y-d-m)))
(test-equal "qif-parse:check-date-format 19790303"
'(y-m-d y-d-m)
(qif-parse:check-date-format
@@ -272,7 +284,6 @@
(qif-parse:parse-numbers/format '("1" #f "300")
'integer)))
;; unfinished
(define (test-qif-split:parse-category)
(test-equal "qif-split:parse-category [Transfer]/Class"
@@ -295,6 +306,18 @@
'("Category" #f "" "miscx-category" #f "")
(qif-split:parse-category #f "Category/|miscx-category"))
(test-equal "qif-split:parse-category Category/Class|miscx-category"
'("Category" #f "Class" "miscx-category" #f "")
(qif-split:parse-category #f "Category/Class|miscx-category"))
(test-equal "qif-split:parse-category [Transfer]/Class|miscx-category"
'("Transfer" #t "Class" "miscx-category" #f "")
(qif-split:parse-category #f "[Transfer]/Class|miscx-category"))
(test-equal "qif-split:parse-category [Transfer]/Class|miscx-category/miscx-class"
'("Transfer" #t "Class" "miscx-category" #f "miscx-class")
(qif-split:parse-category #f "[Transfer]/Class|miscx-category/miscx-class"))
(test-equal "qif-split:parse-category Category/|[miscx-account]"
'("Category" #f "" "miscx-account" #t "")
(qif-split:parse-category #f "Category/|[miscx-account]"))

37
gnucash/report/html-acct-table.scm
View File

@@ -495,6 +495,8 @@
;; user. This class simply maps its contents to the html-table.
;;
(use-modules (srfi srfi-9))
;; this is to work around a bug in the HTML export sytmem
;; which causes COLSPAN= attributes not to be exported (!!)
(define gnc:colspans-are-working-right
@@ -506,23 +508,14 @@
;; utility class for generating account tables
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define <html-acct-table>
(make-record-type "<html-acct-table>"
'(matrix ;; an html-table
env ;; an alist
)))
(define gnc:html-acct-table?
(record-predicate <html-acct-table>))
(define gnc:_make-html-acct-table_
(record-constructor <html-acct-table>))
(define-record-type <html-acct-table>
(gnc:_make-html-acct-table_ matrix env)
gnc:html-acct-table?
(matrix gnc:_html-acct-table-matrix_ gnc:_html-acct-table-set-matrix!_)
(env gnc:_html-acct-table-env_ gnc:_html-acct-table-set-env!_))
(define (gnc:make-html-acct-table)
(gnc:_make-html-acct-table_
(gnc:make-html-table) ;; matrix
#f ;; env
))
(gnc:_make-html-acct-table_ (gnc:make-html-table) #f))
(define (gnc:make-html-acct-table/env env)
(let ((acct-table (gnc:make-html-acct-table)))
@@ -538,18 +531,6 @@
(gnc:html-acct-table-add-accounts! acct-table accts)
acct-table))
(define gnc:_html-acct-table-matrix_
(record-accessor <html-acct-table> 'matrix))
(define gnc:_html-acct-table-set-matrix!_
(record-modifier <html-acct-table> 'matrix))
(define gnc:_html-acct-table-env_
(record-accessor <html-acct-table> 'env))
(define gnc:_html-acct-table-set-env!_
(record-modifier <html-acct-table> 'env))
;; some useful predicates to export
(define (gnc:account-code-less-p a b)
(string<? (xaccAccountGetCode a)
@@ -608,7 +589,7 @@
(if (equal? pred #t) gnc:account-code-less-p pred)))
(start-date (get-val env 'start-date))
(end-date (or (get-val env 'end-date)
(cons 'absolute (cons (current-time) 0))))
(gnc:get-today)))
(report-commodity (or (get-val env 'report-commodity)
(gnc-default-report-currency)))
;; BUG: other code expects a real function here, maybe

4
gnucash/report/reports/standard/invoice.scm
View File

@@ -928,6 +928,8 @@ for styling the invoice. Please see the exported report for the CSS class names.
'in-menu? #t)
(define (gnc:easy-invoice-report-create-internal invoice)
(issue-deprecation-warning
"gnc:easy-invoice-report-create-internal is unused")
(let* ((options (gnc:make-report-options easy-invoice-guid))
(invoice-op (gnc:lookup-option options gnc:pagename-general gnc:optname-invoice-number)))
(gnc:option-set-value invoice-op invoice)
@@ -935,6 +937,8 @@ for styling the invoice. Please see the exported report for the CSS class names.
(export gnc:easy-invoice-report-create-internal)
(define (gnc:fancy-invoice-report-create-internal invoice)
(issue-deprecation-warning
"gnc:fancy-invoice-report-create-internal is unused")
(let* ((options (gnc:make-report-options fancy-invoice-guid))
(invoice-op (gnc:lookup-option options gnc:pagename-general gnc:optname-invoice-number)))
(gnc:option-set-value invoice-op invoice)

5
gnucash/report/test/test-commodity-utils.scm
View File

@@ -213,10 +213,7 @@
(define (teardown)
(let* ((book (gnc-get-current-book))
(pricedb (gnc-pricedb-get-db book)))
(gnc-pricedb-destroy pricedb)
(gnc-clear-current-session)))
(gnc-clear-current-session))
(define (collect collector shares value)
((car collector) 'add shares)

106
gnucash/report/test/test-report-html.scm
View File

@@ -4,10 +4,32 @@
(use-modules (tests test-engine-extras))
(use-modules (gnucash report))
(use-modules (tests test-report-extras))
(use-modules (gnucash report stylesheets plain))
(use-modules (srfi srfi-64))
(use-modules (ice-9 pretty-print))
(use-modules (sxml simple))
(use-modules (tests srfi64-extras))
(use-modules (system vm coverage))
(define (coverage-test)
(let* ((currfile (dirname (current-filename)))
(path (string-take currfile (string-rindex currfile #\/))))
(add-to-load-path path))
(call-with-values
(lambda()
(with-code-coverage run-test-proper))
(lambda (data result)
(let ((port (open-output-file "/tmp/lcov.info")))
(coverage-data->lcov data port)
(close port)))))
(define (run-test)
(if #f
(coverage-test)
(run-test-proper)))
(define (run-test-proper)
(test-runner-factory gnc:test-runner)
(test-begin "Testing/Temporary/test-report-html")
;; if (test-runner-factory gnc:test-runner) is commented out, this
@@ -17,6 +39,8 @@
(test-html-objects)
(test-html-cells)
(test-html-table)
(test-gnc:html-table-add-labeled-amount-line!)
(test-gnc:make-html-acct-table/env/accts)
(test-end "Testing/Temporary/test-report-html")
)
@@ -776,3 +800,85 @@ HTML Document Title</title></head><body></body>\n\
(test-end "HTML Tables - without style sheets")
)
(define (test-gnc:html-table-add-labeled-amount-line!)
(define (table->html table)
(let ((doc (gnc:make-html-document)))
(string-concatenate
(gnc:html-document-tree-collapse
(gnc:html-table-render table doc)))))
(let ((table (gnc:make-html-table)))
(gnc:html-table-add-labeled-amount-line!
table #f #f #f "label" #f #f #f #f #f #f #f)
(test-equal "gnc:html-table-add-labeled-amount-line!"
"<table><tbody><tr><td rowspan=\"1\" colspan=\"1\"><string> <string> label</td>\n<td rowspan=\"1\" colspan=\"1\"><string> </td>\n</tr>\n</tbody>\n</table>\n"
(table->html table)))
(let* ((table (gnc:make-html-table)))
(gnc:html-table-add-labeled-amount-line!
table 5 "tdd" #t "label1" 1 2 "label-markup"
"amount" 3 2 "amount-markup")
(test-equal "gnc:html-table-add-labeled-amount-line! all options"
"<table><tbody><tdd><label-markup rowspan=\"1\" colspan=\"1\"><string> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<string> label1</label-markup>\n<td rowspan=\"1\" colspan=\"1\"><hr /></td>\n<amount-markup rowspan=\"1\" colspan=\"1\"><string> amount</amount-markup>\n<td><string> </td>\n</tdd>\n</tbody>\n</table>\n"
(table->html table))))
(define (test-gnc:make-html-acct-table/env/accts)
;; create html-document, add table, render, convert to sxml
(define (table->sxml table prefix)
(let* ((doc (gnc:make-html-document)))
(gnc:html-document-set-style-sheet! doc (gnc:html-style-sheet-find "Default"))
(gnc:html-document-add-object! doc table)
(let ((render (gnc:html-document-render doc)))
(with-output-to-file (format #f "/tmp/html-acct-table-~a.html" prefix)
(lambda ()
(display render)))
(xml->sxml render
#:trim-whitespace? #t
#:entities '((nbsp . "\xa0")
(ndash . "­"))))))
(let* ((accounts-alist (create-test-data))
(accounts (map cdr accounts-alist)))
(let* ((table (gnc:make-html-table))
(get-balance (lambda (acc start-date end-date)
(let ((coll (gnc:make-commodity-collector)))
(coll 'add (xaccAccountGetCommodity acc) 10)
coll)))
(acct-table (gnc:make-html-acct-table/env/accts
`((get-balance-fn ,get-balance)
(display-tree-depth 9))
accounts)))
(gnc:html-table-add-account-balances table acct-table '())
(let ((sxml (table->sxml table "basic - combo 1")))
(test-equal "gnc:make-html-acct-table/env/accts combo 1"
'("Root" "Asset" "Bank" "GBP Bank" "Wallet" "Liabilities"
"Income" "Income-GBP" "Expenses" "Equity")
(sxml->table-row-col sxml 1 #f 1))))
(let* ((table (gnc:make-html-table))
(acct-table (gnc:make-html-acct-table/env/accts
`((balance-mode pre-closing)
(display-tree-depth 9))
accounts)))
(gnc:html-table-add-account-balances table acct-table '())
(let ((sxml (table->sxml table "basic - combo 2")))
(test-equal "gnc:make-html-acct-table/env/accts combo 2"
'("Root" "Asset" "Bank" "GBP Bank" "Wallet" "Liabilities"
"Income" "Income-GBP" "Expenses" "Equity")
(sxml->table-row-col sxml 1 #f 1))))
(let* ((table (gnc:make-html-table))
(acct-table (gnc:make-html-acct-table/env/accts
'((balance-mode pre-adjusting)
(display-tree-depth 9))
accounts)))
(gnc:html-table-add-account-balances table acct-table '())
(let ((sxml (table->sxml table "basic - combo 3")))
(test-equal "gnc:make-html-acct-table/env/accts combo 3"
'("Root" "Asset" "Bank" "GBP Bank" "Wallet" "Liabilities"
"Income" "Income-GBP" "Expenses" "Equity")
(sxml->table-row-col sxml 1 #f 1))))))

23
libgnucash/app-utils/date-utilities.scm
View File

@@ -84,11 +84,9 @@
(gnc-print-time64 (gnc-mktime datevec) "%B %Y"))
(define (gnc:date-get-week-year-string datevec)
(let* ((beginweekt64 (* (gnc:time64-get-week
(gnc-mktime datevec))
604800))
(begin-string (qof-print-date (+ beginweekt64 345600)))
(end-string (qof-print-date (+ beginweekt64 864000))))
(let* ((beginweekt64 (* (gnc:time64-get-week (gnc-mktime datevec)) 7 86400))
(begin-string (qof-print-date (+ beginweekt64 (* 3 86400))))
(end-string (qof-print-date (+ beginweekt64 (* 9 86400)))))
(format #f (_ "~a to ~a") begin-string end-string)))
;; is leap year?
@@ -156,18 +154,21 @@
(gnc:date-get-month lt)
(gnc:date-get-year lt))))))
;; convert a date in seconds since 1970 into # of two-week periods since
;; Jan 4, 1970 ignoring leap-seconds (just halfing date-to-week-fraction)
(define (gnc:date-to-twoweek-fraction caltime)
(/ (gnc:date-to-week-fraction caltime) 2))
;; convert a date in seconds since 1970 into # of weeks since Jan 4, 1970
;; ignoring leap-seconds
;; which dow does the week start? 1=Sunday, 2=Monday etc
(define weekstart
(let ((dow (gnc-start-of-week)))
(cond
((zero? dow) (gnc:warn "cannot determine start of week. using Sunday") 1)
(else dow))))
(define (gnc:date-to-week-fraction caltime)
(/ (- (/ (/ caltime 3600.0) 24) 3) 7))
(/ (- (/ caltime 86400) 1 weekstart) 7))
(define (gnc:date-to-week caltime)
(floor (/ (- (/ caltime 86400) 3) 7)))
(floor (gnc:date-to-week-fraction caltime)))
;; convert a date in seconds since 1970 into # of days since Feb 28, 1970
;; ignoring leap-seconds

3
libgnucash/core-utils/test/CMakeLists.txt
View File

@@ -47,8 +47,7 @@ set(test_gnc_path_util_SOURCES
${MODULEPATH}/binreloc.c
${MODULEPATH}/gnc-filepath-utils.cpp
${MODULEPATH}/gnc-locale-utils.cpp
gtest-path-utilities.cpp
${GTEST_SRC})
gtest-path-utilities.cpp)
gnc_add_test(test-gnc-path-util "${test_gnc_path_util_SOURCES}"
gtest_core_utils_INCLUDES gtest_core_utils_LIBS "GNC_UNINSTALLED=yes")

2
libgnucash/engine/CMakeLists.txt
View File

@@ -237,7 +237,7 @@ else()
set(BCRYPT "")
endif()
target_link_libraries(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${BCRYPT} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS})
target_link_libraries(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${ICU4C_I18N_LDFLAGS} ${BCRYPT} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS})
target_compile_definitions (gncmod-engine PRIVATE -DG_LOG_DOMAIN=\"gnc.engine\")

25
libgnucash/engine/gnc-date.cpp
View File

@@ -48,6 +48,7 @@ extern "C"
}
#include <cinttypes>
#include <unicode/calendar.h>
#include "gnc-date.h"
#include "gnc-date-p.h"
@@ -201,6 +202,30 @@ gnc_gmtime (const time64 *secs)
}
gint
gnc_start_of_week (void)
{
/* icu's day of week is 1 based. Using 0 here to mean unset or error while setting */
static int cached_result = 0;
if (!cached_result)
{
UErrorCode err = U_ZERO_ERROR;
auto cal = icu::Calendar::createInstance (err);
if (!cal)
{
PERR("ICU error: %s\n", u_errorName (err));
return 0;
}
/* 1 for sunday, 2 for monday, etc. */
cached_result = cal->getFirstDayOfWeek (err);
delete cal;
}
return cached_result;
}
time64
gnc_mktime (struct tm* time)
{

5
libgnucash/engine/gnc-date.h
View File

@@ -185,6 +185,11 @@ struct tm* gnc_localtime_r (const time64 *secs, struct tm* time);
*/
struct tm* gnc_gmtime (const time64 *secs);
/** \brief returns an integer corresponding to locale start of week
* \return An integer 1=Sunday, 2=Monday etc. If error, return 0.
*/
gint gnc_start_of_week (void);
/** \brief calculate seconds from the epoch given a time struct
* \param time: A struct tm* containing the date-time information.
* The time is understood to be in the current local time zone.

31
libgnucash/engine/test/CMakeLists.txt
View File

@@ -99,6 +99,7 @@ set(gtest_qof_LIBS
${GOBJECT_LDFLAGS}
${GMODULE_LDFLAGS}
${GTHREAD_LDFLAGS}
${ICU4C_I18N_LDFLAGS}
${Boost_LIBRARIES}
${GTEST_LIB})
@@ -122,30 +123,26 @@ endif (WIN32)
set(test_gnc_guid_SOURCES
${MODULEPATH}/guid.cpp
test-gnc-guid.cpp
${GTEST_SRC})
test-gnc-guid.cpp)
gnc_add_test(test-gnc-guid "${test_gnc_guid_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)
set(test_kvp_value_SOURCES
${MODULEPATH}/kvp-value.cpp
test-kvp-value.cpp
test-kvp-frame.cpp
${GTEST_SRC})
test-kvp-frame.cpp)
gnc_add_test(test-kvp-value "${test_kvp_value_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)
set(test_qofsession_SOURCES
${MODULEPATH}/qofsession.cpp
test-qofsession.cpp
${GTEST_SRC})
test-qofsession.cpp)
gnc_add_test(test-qofsession "${test_qofsession_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)
set(test_gnc_int128_SOURCES
${MODULEPATH}/gnc-int128.cpp
gtest-gnc-int128.cpp
${GTEST_SRC})
gtest-gnc-int128.cpp)
gnc_add_test(test-gnc-int128 "${test_gnc_int128_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS)
@@ -159,8 +156,7 @@ set(test_gnc_rational_SOURCES
${MODULEPATH}/qoflog.cpp
${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp
${gtest_engine_win32_SOURCES}
gtest-gnc-rational.cpp
${GTEST_SRC})
gtest-gnc-rational.cpp)
gnc_add_test(test-gnc-rational "${test_gnc_rational_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS)
@@ -175,15 +171,13 @@ set(test_gnc_numeric_SOURCES
${MODULEPATH}/qoflog.cpp
${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp
${gtest_engine_win32_SOURCES}
gtest-gnc-numeric.cpp
${GTEST_SRC})
gtest-gnc-numeric.cpp)
gnc_add_test(test-gnc-numeric "${test_gnc_numeric_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS)
set(test_gnc_timezone_SOURCES
${MODULEPATH}/gnc-timezone.cpp
gtest-gnc-timezone.cpp
${GTEST_SRC})
gtest-gnc-timezone.cpp)
gnc_add_test(test-gnc-timezone "${test_gnc_timezone_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)
@@ -194,20 +188,17 @@ set(test_gnc_datetime_SOURCES
${MODULEPATH}/qoflog.cpp
${CMAKE_SOURCE_DIR}/libgnucash/core-utils/gnc-locale-utils.cpp
${gtest_engine_win32_SOURCES}
gtest-gnc-datetime.cpp
${GTEST_SRC})
gtest-gnc-datetime.cpp)
gnc_add_test(test-gnc-datetime "${test_gnc_datetime_SOURCES}"
gtest_engine_INCLUDES gtest_qof_LIBS)
set(test_import_map_SOURCES
gtest-import-map.cpp
${GTEST_SRC})
gtest-import-map.cpp)
gnc_add_test(test-import-map "${test_import_map_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)
set(test_qofquerycore_SOURCES
gtest-qofquerycore.cpp
${GTEST_SRC})
gtest-qofquerycore.cpp)
gnc_add_test(test-qofquerycore "${test_qofquerycore_SOURCES}"
gtest_engine_INCLUDES gtest_old_engine_LIBS)

476
libgnucash/scm/price-quotes.scm
View File

@@ -28,75 +28,40 @@
(use-modules (gnucash utilities))
(use-modules (gnucash gnc-module))
(use-modules (gnucash core-utils))
(use-modules (srfi srfi-1))
(use-modules (srfi srfi-11)
(srfi srfi-1))
(gnc:module-load "gnucash/gnome-utils" 0) ;; for gnucash-ui-is-running
(gnc:module-load "gnucash/app-utils" 0)
(define (item-list->hash! lst hash
getkey getval
hashref hashset
list-duplicates?)
;; Takes a list of the form (item item item item) and returns a hash
;; formed by traversing the list, and getting the key and val from
;; each item using the supplied get-key and get-val functions, and
;; building a hash table from the result using the given hashref and
;; hashset functions. list-duplicates? determines whether or not in
;; the resulting hash, the value for a given key is a list of all
;; the values associated with that key in the input or just the
;; first one encountered.
(define (handle-item item)
(let* ((key (getkey item))
(val (getval item))
(existing-val (hashref hash key)))
(if (not list-duplicates?)
;; ignore if not first value.
(if (not existing-val) (hashset hash key val))
;; else result is list.
(if existing-val
(hashset hash key (cons val existing-val))
(hashset hash key (list val))))))
(for-each handle-item lst)
hash)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(define gnc:*finance-quote-check*
(string-append (gnc-path-get-bindir) "/gnc-fq-check"))
(define (gnc:fq-check-sources)
(let ((program '())
(from-child #f))
(let ((program #f))
(define (start-program)
(if (not (string-null? gnc:*finance-quote-check*))
(set! program (gnc-spawn-process-async
(list "perl" "-w" gnc:*finance-quote-check*) #t))))
(set! program
(gnc-spawn-process-async
(list "perl" "-w" gnc:*finance-quote-check*) #t)))
(define (get-sources)
(if (not (null? program))
(let ((results #f))
(set! from-child (fdes->inport (gnc-process-get-fd program 1)))
(catch
#t
(lambda ()
(set! results (read from-child))
(gnc:debug "results: " results)
results)
(lambda (key . args)
key)))))
(when program
(catch #t
(lambda ()
(let ((results (read (fdes->inport (gnc-process-get-fd program 1)))))
(gnc:debug "gnc:fq-check-sources results: " results)
results))
(lambda (key . args) key))))
(define (kill-program)
(if (not (null? program))
(gnc-detach-process program #t)))
(when program
(gnc-detach-process program #t)
(set! program #f)))
(dynamic-wind
start-program
get-sources
kill-program)))
(dynamic-wind start-program get-sources kill-program)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;
@@ -151,50 +116,43 @@
;; was unparsable. See the gnc-fq-helper for more details
;; about it's output.
(let ((quoter '())
(to-child #f)
(from-child #f))
(let ((quoter #f))
(define (start-quoter)
(if (not (string-null? gnc:*finance-quote-helper*))
(set! quoter (gnc-spawn-process-async
(list "perl" "-w" gnc:*finance-quote-helper*) #t))))
(set! quoter
(gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t)))
(define (get-quotes)
(if (not (null? quoter))
(let ((results #f))
(set! to-child (fdes->outport (gnc-process-get-fd quoter 0)))
(set! from-child (fdes->inport (gnc-process-get-fd quoter 1)))
(map
(lambda (request)
(catch
#t
(lambda ()
(gnc:debug "handling-request: " request)
;; we need to display the first element (the method, so it
;; won't be quoted) and then write the rest
(display #\( to-child)
(display (car request) to-child)
(display " " to-child)
(for-each (lambda (x) (write x to-child)) (cdr request))
(display #\) to-child)
(newline to-child)
(force-output to-child)
(set! results (read from-child))
(gnc:debug "results: " results)
results)
(lambda (key . args)
key)))
requests))))
(when quoter
(map
(lambda (request)
(catch #t
(lambda ()
(gnc:debug "handling-request: " request)
;; we need to display the first element (the method,
;; so it won't be quoted) and then write the rest
(with-output-to-port (fdes->outport (gnc-process-get-fd quoter 0))
(lambda ()
(display #\()
(display (car request))
(display " ")
(for-each write (cdr request))
(display #\))
(newline)
(force-output)))
(let ((results (read (fdes->inport (gnc-process-get-fd quoter 1)))))
(gnc:debug "results: " results)
results))
(lambda (key . args) key)))
requests)))
(define (kill-quoter)
(if (not (null? quoter))
(gnc-detach-process quoter #t)))
(when quoter
(gnc-detach-process quoter #t)
(set! quoter #f)))
(dynamic-wind
start-quoter
get-quotes
kill-quoter)))
(dynamic-wind start-quoter get-quotes kill-quoter)))
(define (gnc:book-add-quotes window book)
@@ -211,47 +169,39 @@
;; form:
;;
;; (("alphavantage" (commodity-1 currency-1 tz-1)
;; (commodity-2 currency-2 tz-2) ...)
;; (commodity-2 currency-2 tz-2) ...)
;; ("fidelity_direct" (commodity-3 currency-3 tz-3)
;; (commodity-4 currency-4 tz-4) ...)
;; ...)
;; ("currency" curr-1 curr-2 tz)
;; ("currency" curr-3 curr-4 tz) ...)
(let* ((ct (gnc-commodity-table-get-table book))
(big-list
(gnc-commodity-table-get-quotable-commodities
ct))
(commodity-list #f)
(currency-list (filter
(lambda (a)
(and
(not (gnc-commodity-equiv (cadr a) (caddr a)))
(not (string=? "XXX" (gnc-commodity-get-mnemonic (cadr a))))
))
(call-with-values
(lambda () (partition!
(lambda (cmd)
(not (string=? (car cmd) "currency")))
big-list))
(lambda (a b) (set! commodity-list a) b))))
(quote-hash (make-hash-table 31)))
(let-values (((currency-list commodity-list)
(partition (lambda (a) (string=? (car a) "currency"))
(gnc-commodity-table-get-quotable-commodities
(gnc-commodity-table-get-table book)))))
(if (and (null? commodity-list) (null? currency-list))
#f
(begin
(let ((commodity-hash (make-hash-table))
(currency-list-filtered
(filter
(lambda (a)
(and (not (gnc-commodity-equiv (cadr a) (caddr a)))
(not (string=? (gnc-commodity-get-mnemonic (cadr a)) "XXX"))))
currency-list)))
;; Now collect symbols going to the same backend.
(item-list->hash! commodity-list quote-hash car cdr hash-ref hash-set! #t)
;; Now collect symbols going to the same backend.
(for-each
(lambda (item)
(let ((key (car item))
(val (cdr item)))
(hash-set! commodity-hash key
(cons val (hash-ref commodity-hash key '())))))
commodity-list)
;; Now translate to just what gnc-fq-helper expects.
(append
(hash-fold
(lambda (key value prior-result)
(cons (cons key value)
prior-result))
'()
quote-hash)
(map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
currency-list))))))
;; Now translate to just what gnc-fq-helper expects.
(append
(hash-map->list cons commodity-hash)
(map (lambda (cmd) (cons (car cmd) (list (cdr cmd))))
currency-list-filtered)))))
(define (fq-call-data->fq-calls fq-call-data)
;; take an output element from book->commodity->fq-call-data and
@@ -260,7 +210,7 @@
;; the latter:
;;
;; ("alphavantage" (commodity-1 currency-1 tz-1)
;; (commodity-2 currency-2 tz-2) ...)
;; (commodity-2 currency-2 tz-2) ...)
;;
;; ("alphavantage" "IBM" "AMD" ...)
;;
@@ -385,26 +335,18 @@
(string? symbol)
(gnc-commodity-table-lookup commodity-table "ISO4217"
(string-upcase symbol)))))
(set! commodity other-curr))
)
(or-map (lambda (price-sym)
(let ((p (assq-ref quote-data price-sym)))
(if p
(begin (set! price p)
(set! price-type price-sym)
#t)
#f)))
'(last nav price))
(set! commodity other-curr)))
(set! price-type
(case price-type
((last) "last")
((nav) "nav")
((price) "unknown")
(else #f)))
(let lp ((price-syms '(last nav price))
(price-types '("last" "nav" "unknown")))
(unless (null? price-syms)
(cond
((assq-ref quote-data (car price-syms)) =>
(lambda (p)
(set! price (gnc-scm-to-numeric p))
(set! price-type (car price-types))))
(else (lp (cdr price-syms) (cdr price-types))))))
(if price
(set! price (gnc-scm-to-numeric price)))
(if gnc-time
(set! gnc-time (timestr->time64 gnc-time time-zone))
(set! gnc-time (gnc:get-today)))
@@ -452,177 +394,137 @@
(let ((pricedb (gnc-pricedb-get-db book)))
(for-each
(lambda (price)
(if price
(begin
(gnc-pricedb-add-price pricedb price)
(gnc-price-unref price)
#f)))
(when price
(gnc-pricedb-add-price pricedb price)
(gnc-price-unref price)))
prices)))
(define (show-error msg)
(gnc:gui-error msg (_ msg)))
;; Add the alphavantage api key to the environment. This value is taken from
;; the Online Quotes preference tab
(let* ((alphavantage-api-key (gnc-prefs-get-string "general.finance-quote" "alphavantage-api-key")))
(gnc:debug (string-concatenate (list "ALPHAVANTAGE_API_KEY=" alphavantage-api-key)))
(if (not (string-null? alphavantage-api-key))
(setenv "ALPHAVANTAGE_API_KEY" alphavantage-api-key)))
;; FIXME: uses of gnc:warn in here need to be cleaned up. Right
;; now, they'll result in funny formatting.
(let ((alphavantage-api-key
(gnc-prefs-get-string "general.finance-quote" "alphavantage-api-key")))
(gnc:debug "ALPHAVANTAGE_API_KEY=" alphavantage-api-key)
(unless (string-null? alphavantage-api-key)
(setenv "ALPHAVANTAGE_API_KEY" alphavantage-api-key)))
(let* ((fq-call-data (book->commodity->fq-call-data book))
(fq-calls (and fq-call-data
(apply append
(map fq-call-data->fq-calls fq-call-data))))
(append-map fq-call-data->fq-calls fq-call-data)))
(fq-results (and fq-calls (gnc:fq-get-quotes fq-calls)))
(commod-tz-quote-triples
(and fq-results (list? (car fq-results))
(fq-results->commod-tz-quote-triples fq-call-data fq-results)))
(commod-tz-quote-triples (and fq-results (list? (car fq-results))
(fq-results->commod-tz-quote-triples
fq-call-data fq-results)))
;; At this point commod-tz-quote-triples will either be #f or a
;; list of items. Each item will either be (commodity
;; timezone quote-data) or (#f . problem-commodity)
(problem-syms
(and commod-tz-quote-triples
(filter-map (lambda (cq-pair)
(if (car cq-pair)
#f
(string-append
(gnc-commodity-get-namespace (cdr cq-pair))
":"
(gnc-commodity-get-mnemonic (cdr cq-pair)))))
commod-tz-quote-triples)))
(problem-syms (and commod-tz-quote-triples
(filter-map
(lambda (cq-pair)
(and (not (car cq-pair))
(string-append
(gnc-commodity-get-namespace (cdr cq-pair))
":"
(gnc-commodity-get-mnemonic (cdr cq-pair)))))
commod-tz-quote-triples)))
;; strip out the "bad" ones from above.
(ok-syms
(and commod-tz-quote-triples
(filter car commod-tz-quote-triples)))
(ok-syms (and commod-tz-quote-triples (filter car commod-tz-quote-triples)))
(keep-going? #t))
(cond
((eq? fq-call-data #f)
((not fq-call-data)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window (_ "No commodities marked for quote retrieval."))
(gnc:warn "No commodities marked for quote retrieval.")))
((eq? fq-results #f)
(show-error (N_ "No commodities marked for quote retrieval.")))
((not fq-results)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window (_ "Unable to get quotes or diagnose the problem."))
(gnc:warn "Unable to get quotes or diagnose the problem.")))
((member 'missing-lib fq-results)
(show-error (N_ "Unable to get quotes or diagnose the problem.")))
((memq 'missing-lib fq-results)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "You are missing some needed Perl libraries.
Run 'gnc-fq-update' as root to install them."))
(gnc:warn "You are missing some needed Perl libraries.
Run 'gnc-fq-update' as root to install them." "\n")))
((member 'system-error fq-results)
(show-error (N_ "You are missing some needed Perl libraries.
Run 'gnc-fq-update' as root to install them.")))
((memq 'system-error fq-results)
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "There was a system error while retrieving the price quotes."))
(gnc:warn "There was a system error while retrieving the price quotes." "\n")))
(show-error (N_ "There was a system error while retrieving the price quotes.")))
((not (list? (car fq-results)))
(set! keep-going? #f)
(if (gnucash-ui-is-running)
(gnc-error-dialog window
(_ "There was an unknown error while retrieving the price quotes."))
(gnc:warn "There was an unknown error while retrieving the price quotes." "\n")))
((and (not commod-tz-quote-triples) (gnucash-ui-is-running))
(gnc-error-dialog window
(_ "Unable to get quotes or diagnose the problem."))
(set! keep-going? #f))
(show-error (N_ "There was an unknown error while retrieving the price quotes.")))
((not commod-tz-quote-triples)
(gnc:warn "Unable to get quotes or diagnose the problem.")
(set! keep-going? #f))
((not (null? problem-syms))
(if (gnucash-ui-is-running)
(if (and ok-syms (not (null? ok-syms)))
(set!
keep-going?
(gnc-verify-dialog window #t
(call-with-output-string
(lambda (p)
(display (_ "Unable to retrieve quotes for these items:") p)
(newline p)
(display " " p)
(display (string-join problem-syms "\n ") p)
(newline p)
(display (_ "Continue using only the good quotes?") p)))))
(begin
(gnc-error-dialog window
(call-with-output-string
(lambda (p)
(display
(_ "Unable to retrieve quotes for these items:") p)
(newline p)
(display " " p)
(display (string-join problem-syms "\n ") p))))
(set! keep-going? #f)))
(gnc:warn
(call-with-output-string
(lambda (p)
(display "Unable to retrieve quotes for these items:" p)
(newline p)
(display " " p)
(display (string-join problem-syms "\n ") p)
(newline p)
(display "Continuing with good quotes." p)
(newline p)))))))
(set! keep-going? #f)
(show-error (N_ "Unable to get quotes or diagnose the problem.")))
(if
keep-going?
(let ((prices (map (lambda (triple)
(commodity-tz-quote-triple->price book triple))
ok-syms)))
(if (any string? prices)
(if (gnucash-ui-is-running)
(set!
keep-going?
(gnc-verify-dialog window #t
(call-with-output-string
(lambda (p)
(display (_ "Unable to create prices for these items:") p)
(newline p)
(display " " p)
(display (string-join (filter string? prices) "\n ") p)
(newline p)
(display (_ "Add remaining good quotes?") p)))))
(gnc:warn
(call-with-output-string
(lambda (p)
(display "Unable to create prices for these items:" p)
(newline p)
(display " " p)
(display (string-join (filter string? prices) "\n ") p)
(newline p)
(display "Adding remaining good quotes." p)
(newline p))))))
((pair? problem-syms)
(cond
((not (gnucash-ui-is-running))
(gnc:warn
(with-output-to-string
(lambda ()
(display "Unable to retrieve quotes for these items:\n")
(display (string-join problem-syms "\n "))
(newline)
(display "Continuing with good quotes.")
(newline)))))
(if keep-going?
(book-add-prices! book (filter
(lambda (x) (not (string? x)))
prices)))))))
((and ok-syms (not (null? ok-syms)))
(set! keep-going?
(gnc-verify-dialog
window #t (with-output-to-string
(lambda ()
(display (_ "Unable to retrieve quotes for these items:"))
(display "\n ")
(display (string-join problem-syms "\n "))
(newline)
(display (_ "Continue using only the good quotes?")))))))
; (define (get-1-quote exchange . items)
; (let ((cmd (apply list 'fetch exchange items))
; (quoter (run-sub-process #f
; gnc:*finance-quote-helper*
; gnc:*finance-quote-helper*)))
; (and quoter
; (write cmd (caddr quoter))
; (newline (caddr quoter))
; (force-output (caddr quoter))
; (let ((result (read (cadr quoter))))
; (close-input-port (cadr quoter))
; (close-output-port (caddr quoter))
; result))))
(else
(set! keep-going? #f)
(gnc-error-dialog
window (with-output-to-string
(lambda ()
(display (_ "Unable to retrieve quotes for these items:"))
(display "\n ")
(display (string-join problem-syms "\n ")))))))))
(when keep-going?
(let ((prices (map (lambda (triple)
(commodity-tz-quote-triple->price book triple))
ok-syms)))
(when (any string? prices)
(if (gnucash-ui-is-running)
(set! keep-going?
(gnc-verify-dialog
window #t
(with-output-to-string
(lambda ()
(display (_ "Unable to create prices for these items:"))
(display "\n ")
(display (string-join (filter string? prices) "\n "))
(newline)
(display (_ "Add remaining good quotes?"))))))
(gnc:warn
(with-output-to-string
(lambda ()
(display "Unable to create prices for these items:\n ")
(display (string-join (filter string? prices) "\n "))
(newline)
(display "Adding remaining good quotes.")
(newline))))))
(when keep-going?
(book-add-prices! book (filter (negate string?) prices)))))))
(define (gnc:price-quotes-install-sources)
(let ((sources (gnc:fq-check-sources)))
(if (list? sources)
(begin
;; Translators: ~A is the version string
(cond
((list? sources)
;; Translators: ~A is the version string
(format #t (_ "Found Finance::Quote version ~A.") (car sources))
(newline)
(gnc:msg "Found Finance::Quote version " (car sources))
(gnc-quote-source-set-fq-installed (car sources) (cdr sources))))))
(gnc:msg "Found Finance::Quote version " (car sources))
(gnc-quote-source-set-fq-installed (car sources) (cdr sources))))))

10117
po/de.po
View File

File diff suppressed because it is too large Load Diff

2
po/glossary/de.po
View File

@@ -688,7 +688,7 @@ msgstr "Aktiensaldo"
#. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
msgid "shares"
msgstr "Anteile "
msgstr "Anteile"
#. "(of a price) A place wfrom which sth comes or is obtained"
msgid "source"

2
po/glossary/gnc-glossary.txt
View File

@@ -1,6 +1,6 @@
"Term (Dear translator: This file will never be visible to the user!)" "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.)"
"account" "A detailed record of money spent and received"
"account code" "-"
"account code" "An alphanumerical key of an account in GnuCash, not at the bank, can be used to sort. Some templates provide them or the user can enter them."
"account hierarchy" "the tree view of all accounts"
"account name" "-"
"account type: Active" "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"

335
po/glossary/he.po
View File

@@ -5,15 +5,16 @@
#
msgid ""
msgstr ""
"Project-Id-Version: gnucash 2.2\n"
"POT-Creation-Date: 2017-10-20 19:04+0200\n"
"PO-Revision-Date: 2008-04-23 00:04+0200\n"
"Last-Translator: Ori Hoch <ori@uumpa.com>\n"
"Project-Id-Version: gnucash 3.6\n"
"POT-Creation-Date: 2019-08-12 17:40+0300\n"
"PO-Revision-Date: 2019-08-12 17:55+0300\n"
"Last-Translator: Avi Markovitz <avi.markovitz@gmail.com>\n"
"Language-Team: HE\n"
"Language: Hebrew\n"
"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.2.1\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!)"
@@ -29,168 +30,163 @@ msgstr "קוד חשבון"
#. "the tree view of all accounts"
msgid "account hierarchy"
msgstr "היררכית חשבונות"
msgstr "תרשים חשבונות"
#. "-"
msgid "account name"
msgstr "שם חשבון"
#. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form"
#, fuzzy
msgid "account type: Active"
msgstr "נכס"
msgstr "סוג חשבון: פעיל"
#. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead."
msgid "account type: Asset"
msgstr "נכס"
msgstr "סוג חשבון: נכס"
#. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'"
#, fuzzy
msgid "account type: Assets & Liabilities"
msgstr "חוב"
msgstr "סוג חשבון: נכסים והתחיבויות"
#. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice"
msgid "account type: checking"
msgstr "עובר ושב"
msgstr "סוג חשבון: עובר ושב"
#. "-"
msgid "account type: currency"
msgstr "מטבע"
msgstr "סוג חשבון: מטבע"
#. "see: Equity, but see also 'account type: Passive'"
msgid "account type: Equity"
msgstr "זכות"
msgstr "סוג חשבון: הון"
#. "-"
msgid "account type: Expense"
msgstr "הוצאות"
msgstr "סוג חשבון: הוצאות"
#. "-"
msgid "account type: Income"
msgstr "הכנסות"
msgstr "סוג חשבון: הכנסות"
#. "A debt, a financial obligation, but see also 'account type: Passive'"
msgid "account type: Liability"
msgstr "חוב"
msgstr "סוג חשבון: הצחיבויות"
#. "-"
msgid "account type: money-market"
msgstr "שוק ההון"
msgstr "סוג חשבון: שוק ההון"
#. "-"
msgid "account type: Mutual fund"
msgstr "קרן נאמנות"
msgstr "סוג חשבון: קרן נאמנות"
#. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugs.gnucash.org/show_bug.cgi?id=421766"
#, fuzzy
msgid "account type: Passive"
msgstr "נכס"
msgstr "סוג חשבון: סביל"
#. "Group of accounts tracking your success, complement of 'Assets & Liabilities'"
#, fuzzy
msgid "account type: Profit & Loss"
msgstr "נכס"
msgstr "סוג חשבון: רווח והפסד"
#. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account"
msgid "account type: saving"
msgstr "חיסכון"
msgstr "סוג חשבון: חיסכון"
#. "-"
msgid "account type: Stock"
msgstr "מניות"
msgstr "סוג חשבון: נירות ערך"
#. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another"
#, fuzzy
msgid "account type: trading"
msgstr "חיסכון"
msgstr "סוג חשבון: המרה"
#. "-"
msgid "account: parent account"
msgstr "חשבון אב"
msgstr "חשבון: חשבון אב"
#. "-"
msgid "account: subaccount"
msgstr "תת חשבון"
msgstr "חשבון: חשבון משנה"
#. "-"
msgid "account: top level account"
msgstr "חשבון ראשי"
msgstr "חשבון: רמה עליונה"
#. "The process of doing something that caused a transaction to happen"
msgid "Action (register)"
msgstr "פעולה"
msgstr "פעולה (יומן)"
#. "Automated teller machine"
msgid "action: ATM"
msgstr "כספומט"
msgstr "פעולה: כספומט"
#. "Transaction was an auto deposit"
msgid "action: autoDep"
msgstr "הפקדה אוטומטית"
msgstr "פעולה: הפקדה אוטומטית"
#. "-"
msgid "action: buy"
msgstr "קניה"
msgstr "פעולה: קניה"
#. "-"
msgid "action: deposit"
msgstr "הפקדה"
msgstr "פעולה: הפקדה"
#. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit."
msgid "action: direct debit"
msgstr "חיוב ישיר"
msgstr "פעולה: חיוב ישיר"
#. "transaction is a distribution (???)"
msgid "action: dist"
msgstr "הפצה"
msgstr "פעולה: הפצה"
#. "transaction is a dividend"
msgid "action: div"
msgstr "דיבידנד"
msgstr "פעולה: דיבידנד"
#. "-"
msgid "action: fee"
msgstr "עמלה"
msgstr "פעולה: עמלה"
#. "transaction comes from interest"
msgid "action: int"
msgstr "ריבית"
msgstr "פעולה: ריבית"
#. "-"
msgid "action: loan"
msgstr "הלוואה"
msgstr "פעולה: הלוואה"
#. "see: payment 1."
msgid "action: payment"
msgstr "תשלום"
msgstr "פעולה: תשלום"
#. "Point of sale"
msgid "action: POS"
msgstr "נקודת מכירה"
msgstr "פעולה: נקודת מכירה"
#. "-"
msgid "action: rebate"
msgstr "זיכוי"
msgstr "זיפעולה: החזר"
#. "-"
msgid "action: sell"
msgstr "מכירה"
msgstr "פעולה: מכירה"
#. "-"
msgid "action: Teller"
msgstr "כספר"
msgstr "פעולה: כספר"
#. "see: transfer 2. (=credit transfer)"
msgid "action: transfer"
msgstr "העברה"
msgstr "פעולה: העברה"
#. "-"
msgid "action: wire"
msgstr ""
msgstr "פעולה: מברק"
#. "-"
msgid "action: withdraw"
msgstr "משיכה"
msgstr "פעולה: משיכה"
#. "A sum of money"
msgid "amount"
@@ -202,7 +198,7 @@ msgstr "ממוצע"
#. "The amount of money that is in one's account"
msgid "balance (noun)"
msgstr "מאזן"
msgstr "מאזן (שם עצם)"
#. "A written record of money received and paid out, showing the difference between the two total amounts"
msgid "balance sheet"
@@ -210,7 +206,7 @@ msgstr "מאזן"
#. "To arrange for income and spending to be equal"
msgid "balance, to"
msgstr "לאזן"
msgstr "לאזן, ל"
#. "-"
msgid "bank"
@@ -218,12 +214,11 @@ msgstr "בנק"
#. "A written statement of money owed for goods or services supplied. In Gnucash, a 'bill' is a statement that we received (from a vendor), whereas an 'invoice' is one that we sent out (to a customer)."
msgid "bill"
msgstr "חשבון"
msgstr "הודעת חיוב"
#. "see invoice owner"
#, fuzzy
msgid "bill owner"
msgstr "תנאי תשלום"
msgstr "בעל החיוב"
#. "Conditions on paying a bill. Both an invoice and a bill have billing terms. For example, you can have 'terms' of 'Net-30', where the bill is due in full in 30 days."
msgid "billing terms"
@@ -231,11 +226,11 @@ msgstr "תנאי תשלום"
#. "The dataset that encapsulates all the collections of entities (accounts etc.) in gnucash. The written records of the financial affairs of a business."
msgid "Book"
msgstr "ספר"
msgstr "ספרים"
#. "Completing the records of financial affairs for a specific time period, e.g. at the end of the year."
msgid "book closing"
msgstr "סגירת ספר"
msgstr "סגירת ספרים"
#. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
msgid "Budget"
@@ -243,20 +238,19 @@ msgstr "תקציב"
#. "-"
msgid "business (adjective)"
msgstr "עסקי"
msgstr "עסקי (שם תואר)"
#. "as Menu Item: Headline for features that are related to small business accounting"
msgid "business (noun)"
msgstr "עסק"
msgstr "עסק (שם עסק)"
#. "Profits made from the sale of investments or property"
msgid "capital gains"
msgstr "תשואה"
msgstr "רווחי הון"
#. "Distinguishing the uppercase and lowercase letters"
#, fuzzy
msgid "case sensitive"
msgstr "מבדיל בין אותיות גדולות לקטנות"
msgstr "תלוי רישיות"
#. "Money in coins or notes"
msgid "cash"
@@ -268,15 +262,15 @@ msgstr "המחאה"
#. "To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Formerly known as 'to scrub'."
msgid "check and repair, to"
msgstr "לבדוק ולתקן"
msgstr "בדיקה ותיקון, ל"
#. "To end an application's relationship with an open file so that the application will no longer be able to access the file without opening it again. "
msgid "close, to"
msgstr "לסגור"
msgstr "סגירה, ל"
#. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock."
msgid "commodity"
msgstr "מטבע"
msgstr "סחורה"
#. "e.g. NASDAQ"
msgid "commodity listing"
@@ -284,20 +278,19 @@ msgstr "בורסה"
#. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)"
msgid "commodity option: fraction"
msgstr "שבר"
msgstr "אפשרות סחורה: שבר"
#. "e.g. USD, DEM"
msgid "commodity option: Symbol"
msgstr "סמל"
msgstr "אפשרות סחורה: סמל"
#. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit."
#, fuzzy
msgid "compound interests"
msgstr "ריבית"
msgstr "ריבית דריבית"
#. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account."
msgid "Credit (column in register)"
msgstr ""
msgstr "זכות (עמודה ביומן)"
#. "-"
msgid "Credit Card"
@@ -308,9 +301,8 @@ msgid "credit transfer"
msgstr "העברה בנקאית"
#. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice"
#, fuzzy
msgid "credit note"
msgstr "העברה בנקאית"
msgstr "הודעת זיכוי"
#. "The system of money used in a country"
msgid "currency"
@@ -338,7 +330,7 @@ msgstr "טווח תאריכים"
#. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account."
msgid "Debit (column in register)"
msgstr ""
msgstr "חובה (עמודה ביומן)"
#. "Each option has a default setting that it is shipped with, until the user changes the setting."
msgid "default"
@@ -346,20 +338,19 @@ msgstr "ברירת מחדל"
#. "see credit"
msgid "deposit (in the reconcile dialog)"
msgstr ""
msgstr "הפקדה"
#. "The process of something becoming less valuable"
msgid "depreciation"
msgstr ""
msgstr "פחת"
#. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about."
msgid "Description (column in register)"
msgstr "תיאור"
#. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)."
#, fuzzy
msgid "discount"
msgstr "חשבון"
msgstr "הנחה"
#. "Important Buzzword :)"
msgid "double entry"
@@ -375,11 +366,11 @@ msgstr "הון עצמי"
#. "Report that ... FIXME: Add description."
msgid "equity statement"
msgstr ""
msgstr "תדפיס הון"
#. "A trusted third party that holds a payment or deposit until a transaction is completed. In the US, many mortgage companies set up an escrow account when you get a mortgage. You pay into the account every month and they disburse amounts out of the escrow to pay for hazard insurance and property taxes. So they are holding funds 'in escrow' to complete the transactions (paying insurance and taxes)."
msgid "escrow (account)"
msgstr ""
msgstr "חשבון נאמנות"
#. "The relation in value between the money used in different countries"
msgid "exchange rate"
@@ -398,14 +389,12 @@ msgid "file type"
msgstr "סוג קובץ"
#. "-"
#, fuzzy
msgid "financial calculator: interest rate"
msgstr "מחשבון עם מצבים פיננסיים ומדעיים"
msgstr "מחשבון פיננסי: שער ריבית"
#. "see: payment"
#, fuzzy
msgid "financial calculator: payments"
msgstr "מקש קיצור למחשבון"
msgstr "מחשבון פיננסי: תשלומים"
#. "An increase in wealth; profit; advantage (See also: capital gains)"
msgid "gain"
@@ -413,16 +402,15 @@ msgstr "רווח"
#. "Name of an automatically created account to get imbalanced transactions back in balance"
msgid "imbalance"
msgstr ""
msgstr "לא מאוזן"
#. "Process of extracting data from a non-Gnucash format into a Gnucash file. E.g. QIF Import."
msgid "import"
msgstr "ייבוא"
#. "Report that ... FIXME: add description. This report used to be called the 'Profit & Loss', but it was renamed on 2004-07-13."
#, fuzzy
msgid "income statement"
msgstr "תילכת-תלוטנ הארוה"
msgstr "תדפיס הכנסות"
#. "Money charged for borrowing money, or paid to somebody who invests money"
msgid "interest"
@@ -433,9 +421,8 @@ msgid "invoice"
msgstr "קבלה"
#. "In business accounting: Jobs are a mechanism by which you can group multiple invoices or bills that belong to the same customer or vendor. The job describes a (larger) piece of work or a task undertaken on order, for which one or many invoices or bills will be issued."
#, fuzzy
msgid "job"
msgstr "%s משימה #%d"
msgstr "ריכוז"
#. "A book in which a bank, business firm, etc. records its financial accounts"
msgid "ledger"
@@ -443,7 +430,7 @@ msgstr "ספר חשבונות"
#. "The heading for the right side of the balance sheet. See also: Equity."
msgid "liabilities/equity"
msgstr ""
msgstr "התחייבויות/הון"
#. "A sum of money that is lent (by a bank)"
msgid "loan"
@@ -454,13 +441,12 @@ msgid "loss"
msgstr "הפסד"
#. "name of an automatically created account"
#, fuzzy
msgid "Lost Accounts"
msgstr "The accounts list"
msgstr "חשבונות אבודים"
#. "A particular collection of items that were bought in one transaction. A lot is typically formed when the item is bought, and is closed when the item is sold out. Needed e.g. for U.S. tax purposes."
msgid "Lot"
msgstr ""
msgstr "דבוקה"
#. "Combine two books into one (see book)."
msgid "merge, to"
@@ -468,16 +454,15 @@ msgstr "לאחד"
#. "The thing that the scatter plot uses to mark each data point"
msgid "marker"
msgstr ""
msgstr "סמן"
#. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent."
msgid "markup"
msgstr ""
msgstr "מרווח"
#. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
#, fuzzy
msgid "MDI modus"
msgstr "Accessible MDI Value"
msgstr "מנגנון הצגת חלונות מרובים"
#. "One textfield per split that should help you remember what this split was about."
msgid "Memo"
@@ -496,19 +481,16 @@ msgid "net"
msgstr "נטו"
#. "net total of all assets"
#, fuzzy
msgid "net assets"
msgstr "הספק רשת"
msgstr "נכסים נטו"
#. "The total income minus the total expenses of a given time period."
#, fuzzy
msgid "net profit"
msgstr "הספק רשת"
msgstr "רווח נקי"
#. "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit."
#, fuzzy
msgid "net worth"
msgstr "הספק רשת"
msgstr "ערך נקי"
#. "One textfield per transaction that can hold explanatory text about the transaction."
msgid "notes (register)"
@@ -531,17 +513,16 @@ msgid "options"
msgstr "אפשרויות"
#. "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."
#, fuzzy
msgid "order"
msgstr "סדר"
msgstr "הזמנה"
#. "Name of an automatically created account that holds splits that have no account."
msgid "orphan"
msgstr ""
msgstr "יתום"
#. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner."
msgid "owner (of bill, invoice or expense voucher)"
msgstr ""
msgstr "בעלים (של חיוב, חשבונית או שובר תשלום)"
#. "A secret phrase that one needs to know in order to get access to a user account "
msgid "passphrase"
@@ -549,15 +530,15 @@ msgstr "סיסמה"
#. "An amount that must be paid / An amount for which money has not yet been received"
msgid "Payables/Receivables"
msgstr ""
msgstr "זכאים/חייבים"
#. "A person to whom sth is paid"
msgid "payee"
msgstr ""
msgstr "מוטב"
#. "A person who pays or who has to pay for sth"
msgid "payer"
msgstr ""
msgstr "משלם"
#. "1. The action of paying sb/sth or of being paid. 2. A sum of money paid."
msgid "payment"
@@ -565,118 +546,103 @@ msgstr "תשלום"
#. "An account where no transactions may be posted to; transactions can only be posted to subaccounts of this account, so this account serves as a placeholder in the hierarchy"
msgid "placeholder"
msgstr ""
msgstr "שומר מקום"
#. "A set of investments owned by a person"
msgid "portfolio"
msgstr ""
msgstr "תיק השקעות"
#. "Register invoice, voucher in account register"
#, fuzzy
msgid "post, to"
msgstr "לסגור"
msgstr "רישום, ל"
#. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
msgid "preferences"
msgstr "מאפיינים"
#. "Loan repayment calculator: your payments are split in interests payment and principal payment"
#, fuzzy
msgid "principal payment"
msgstr "תשלום"
msgstr "תשלום קרן"
#. "An amount of money for which sth may be bought or sold"
#, fuzzy
msgid "price (in a split)"
msgstr "הכפל לאחר פיצול"
msgstr "מחיר (בפיצול מניות)"
#. "An ask is an offer to sell, and the price you want to sell at."
#, fuzzy
msgid "price type: ask"
msgstr "_שאל בכל פעם"
msgstr "סוג מחיר: מכירה"
#. "A bid is an offer to buy, and the price you want to buy at."
#, fuzzy
msgid "price type: bid"
msgstr "סוג מדיה שבור"
msgstr "סוג מחיר: קניה"
#. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities"
#, fuzzy
msgid "price: quotes"
msgstr "ה&צג מרכאות"
msgstr "מחיר: שער"
#. "Money gained in business, esp. the difference between the amount earned (sales) and the amount spent (expenses/cost): Profit is sales minus expenses/cost."
msgid "profit"
msgstr ""
msgstr "רווח"
#. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period"
msgid "Profit & Loss"
msgstr ""
msgstr "רווח והפסד"
#. "-"
#, fuzzy
msgid "quick-fill"
msgstr "justify fill"
msgstr "השלמה מהירה"
#. "-"
#, fuzzy
msgid "rebalance, to (a transaction)"
msgstr "לא מצליח לכתוב ל-%s"
msgstr "איזון מחדש"
#. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account."
#, fuzzy
msgid "reconcile, to"
msgstr "%s (בגלל %s) "
msgstr "התאמה, ל"
#. "-"
#, fuzzy
msgid "record keeping"
msgstr "רישום ביבליוגרפי"
msgstr "שמירת מסמכים"
#. "A list of items; a book containing such a list"
#, fuzzy
msgid "register"
msgstr "הרשם"
msgstr "יומן"
#. "A transaction that is divided into two or more parts"
msgid "register entry: split transaction"
msgstr ""
msgstr "רישום יומן: פיצול תנועה"
#. "-"
msgid "register entry: stock split"
msgstr ""
msgstr "רישום יומן: פיצול מניות"
#. "one form of register"
msgid "register: auto-split ledger"
msgstr ""
msgstr "יומן: כרטסת פיצול אוטומטי"
#. "another form of register"
#, fuzzy
msgid "register: basic ledger"
msgstr "מחשב אסטרטגיה בסיסית..."
msgstr "יומן: כרטסת בסיסית"
#. "another form of register"
#, fuzzy
msgid "register: general ledger"
msgstr "מידע כללי"
msgstr "יומן: כרטסת חשבונות"
#. "another form of register"
#, fuzzy
msgid "register: transaction journal"
msgstr "הירשם למאגר מקומי"
msgstr "יומן: יומן תנועות"
#. "reload the current document"
#, fuzzy
msgid "reload, to"
msgstr "%s (בגלל %s) "
msgstr "טעינה מחודשת, ל"
#. "aka 'two-sided form' is in Europe often used for the balance sheet. Complement: report form: Vertical Form"
msgid "report form: T Account Form"
msgstr ""
msgstr "טופס דוח: טופס חשבון טי"
#. "aka 'running form' is in english speaking countries usually used for the balance sheet in one column. Complement: report form: T Account Form"
msgid "report form: Vertical Form"
msgstr ""
msgstr "טופס דוח: חשבון אנכי"
#. "name of an equity account (?); to be distinguished from the opening balance."
msgid "Retained Earnings"
@@ -684,92 +650,79 @@ msgstr "Retained Earnings"
#. "Create a new transaction that is the inverse of the old one. When you add the two together they completely cancel out. Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'."
msgid "reverse transaction, to (Action in the register)"
msgstr ""
msgstr "תנועת היפוך, ל (פעולה ביומן, סטורנו)"
#. "(In the customer summary report) The total amount of money received because something was sold."
msgid "sales"
msgstr ""
msgstr "מכירות"
#. "To write data (typically a file) to a storage medium, such as a disk or tape."
#, fuzzy
msgid "save, to (to a file)"
msgstr "_שמירה לקובץ..."
msgstr "שמירה, ל (לקובץ)"
#. "A transaction or reminder of a transaction that can be automatically executed at a specific time. It can be executed either once, or several times at regular intervals."
#, fuzzy
msgid "Scheduled Transaction"
msgstr "מבצע משימות מתוזמנות"
msgstr "תנועה מחזורית"
#. "DEPRECATED. To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Deprecated - use the term 'to check and repair' now."
#, fuzzy
msgid "scrub, to"
msgstr "%s (בגלל %s) "
msgstr "ניקוי"
#. "A document or certificate showing who owns shares"
#, fuzzy
msgid "security"
msgstr "אבטחה"
msgstr "בטוחה"
#. "-"
#, fuzzy
msgid "Share Balance (register)"
msgstr "הירשם למאגר מקומי"
msgstr "איזון מניות (יומן)"
#. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
msgid "shares"
msgstr ""
msgstr "מניות"
#. "(of a price) A place wfrom which sth comes or is obtained"
#, fuzzy
msgid "source"
msgstr "מקור:‏"
msgstr "מקור:"
#. "One of the two or several parts a transaction is divided into"
#, fuzzy
msgid "split"
msgstr "פצל"
msgstr "פיצול"
#. "This sets the particular design or shape of a report."
#, fuzzy
msgid "style sheet"
msgstr "גיליון מסוגנן"
msgstr "גיליון סגנון"
#. "The total of a set of figures that are part of a larger group of figures"
msgid "subtotal"
msgstr ""
msgstr "סכום ביניים"
#. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation"
#, fuzzy
msgid "tax code"
msgstr "מידע על הפרויקט"
msgstr "קוד מס"
#. "field of an account"
#, fuzzy
msgid "tax info"
msgstr "מידע על הפרויקט"
msgstr "מידע מס"
#. "if you create a new e.g. style sheet, you can start from a template"
#, fuzzy
msgid "template"
msgstr "תבנית"
#. "see: date range"
#, fuzzy
msgid "time period"
msgstr "קו זמן"
msgstr "תקופת זמן"
#. "as abbreviation for Total"
msgid "Tot"
msgstr ""
msgstr "סה\"כ"
#. "The full number or amount: total of some balances, of any account's running balance etc."
#, fuzzy
msgid "total"
msgstr "סה\"כ"
msgstr "סך הכל"
#. "A piece of business done; the transfer of money from one account to one or more other accounts. (see also: Scheduled Transaction)"
msgid "transaction"
msgstr ""
msgstr "תנועה"
#. "A transaction whose amount has actually been moved. The word comes from checks: a check is issued, but several steps have to be done until the amount is actually retrieved from the bank account, which is the point in time where that transaction (check) gets cleared."
msgid "transaction state: cleared"
@@ -788,32 +741,26 @@ msgid "transaction state: voided"
msgstr "שגוי"
#. "1. The action of transferring sth. 2. see: credit transfer"
#, fuzzy
msgid "transfer (noun)"
msgstr "ההעברה הושלמה"
msgstr "העברה (שם עצם)"
#. "The account where an amount is transferred to"
#, fuzzy
msgid "transfer account"
msgstr "מספר _חשבון:"
msgstr "חשבון נגדי"
#. "To move money from one account to another. Will create a transaction."
#, fuzzy
msgid "transfer, to (register toolbar)"
msgstr "How to draw the toolbar"
msgstr "העברה, ל (סרגל כלים ביומן)"
#. "The trial balance is a worksheet on which you list all your general ledger accounts and their debit or credit balance. It is a tool that is used to alert you to errors in your books. The total debits must equal the total credits. If they don't equal, you know you have an error that must be tracked down."
#, fuzzy
msgid "trial balance (report)"
msgstr "התגלה דיווח התרסקות"
msgstr "מאזן בוחן (דוח)"
#. "A class or things that have characteristics in common; type of an account, of a commodity etc."
#, fuzzy
msgid "type"
msgstr "<b>סוג:</b>"
msgstr "סוג"
#. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format."
#, fuzzy
msgid "units"
msgstr "יחידות"
@@ -822,22 +769,20 @@ msgid "URL"
msgstr "כתובת אינטרנט (‏‪URL‬‏)‏"
#. "The worth of sth in terms of money or other commodities for which it can be exchanged"
#, fuzzy
msgid "value (in a split)"
msgstr "Value in list"
msgstr "ערך (בפיצול)"
#. "In small business accounting: A person or company that sells items and is supplying goods"
msgid "vendor"
msgstr "יצרן"
msgstr "ספק"
#. "The terms 'Voucher' and 'Expense Voucher' are used interchangeably in gnucash. The 'Expense Voucher' is also a bit of a misnomer -- it's more like an 'Expense Report' in gnucash. The phrase is meant to be a list of expenses incurred by an employee for which the company will reminburse them."
msgid "voucher"
msgstr ""
msgstr "שובר"
#. "see debit"
#, fuzzy
msgid "withdraw (in the reconcile dialog)"
msgstr "חלק מההגדרות בתיבת הדו-שיח מתנגשים"
msgstr "משיכה (בתיבת דו שיח התאמות)"
#, fuzzy
#~ msgid "invoice owner"

2
po/glossary/txt-to-pot.sh
View File

@@ -25,7 +25,7 @@ fi
# Note: Line 3: PACKAGE and probably a few other variables are hardcoded
cat <<!
# SOME DESCRIPTIVE TITLE.
# SOME DESCRIPTIVE TITLE. (Glossary)
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the GnuCash package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.

40834
po/he.po
View File

File diff suppressed because it is too large Load Diff