Merge branch 'maint'

CMakeLists.txt

@@ -181,8 +181,8 @@ if (WIN32)
   set(REGEX_LDFLAGS "-L${REGEX_LIB_PATH} -lregex")
   #set(LIBXSLT_INCLUDE_DIR ${CMAKE_PREFIX_PATH}/libxslt/include)
   #set(LIBXSLT_XSLTPROC_EXECUTABLE ${CMAKE_PREFIX_PATH}/libxslt/bin/xsltproc)
-#Prevent creating a console window on startup.
+#Prevent creating a console window on startup and harden the executable.
-  set(CMAKE_EXE_LINKER_FLAGS -mwindows)
+  set(CMAKE_EXE_LINKER_FLAGS "-mwindows -Wl,--nxcompat -Wl,--dynamicbase")
 endif()
 
 find_package(Threads REQUIRED)
@@ -924,8 +924,14 @@ install(CODE
 #For windows, copy in some DLLs from Mingw
 
 if (WIN32)
-  find_library(LIBSTDC++ libstdc++-6.dll)
+  find_file(LIBSTDC++ libstdc++-6.dll)
-  find_library(LIBDW2 libgcc_s_dw2-1.dll)
+  if (NOT LIBSTDC++)
+    message(FATAL_ERROR "libstdc++ not found.")
+  endif()
+  find_file(LIBDW2 libgcc_s_dw2-1.dll)
+  if (NOT LIBDW2)
+    message(FATAL_ERROR "libgcc_s_dw2-l not found.")
+  endif()
   set(MINGW_DLLS ${LIBSTDC++} ${LIBDW2})
   install(PROGRAMS ${MINGW_DLLS} DESTINATION ${CMAKE_INSTALL_BINDIR})
   file(COPY ${MINGW_DLLS} DESTINATION ${BINDIR_BUILD}

common/cmake_modules/GncAddTest.cmake

@@ -89,7 +89,11 @@ function(gnc_add_test _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_
     )
     set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
   else()
-    add_test(NAME ${_TARGET} COMMAND ${_TARGET} CONFIGURATIONS Debug;Release)
+    if (CMAKE_GENERATOR STREQUAL Xcode)
+      add_test(NAME ${_TARGET} COMMAND ${_TARGET} CONFIGURATIONS Debug;Release)
+    else()
+      add_test(NAME ${_TARGET} COMMAND ${_TARGET})
+    endif()
     set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
   endif()
   add_dependencies(check ${_TARGET})

gnucash/gnome-utils/cursors.c

@@ -50,7 +50,8 @@ gnc_ui_set_cursor (GdkWindow *win, GNCCursorType type, gboolean update_now)
         return;
 
     if (type != GNC_CURSOR_NORMAL)
-        cursor = gdk_cursor_new_for_display (gdk_display_get_default (), (GdkCursorType)type);
+        cursor = gdk_cursor_new_for_display (gdk_window_get_display (win),
+                                             (GdkCursorType)type);
 
     gdk_window_set_cursor (win, cursor);
 

gnucash/gnome-utils/dialog-dup-trans.c

@@ -183,7 +183,8 @@ gnc_dup_trans_dialog_create (GtkWidget * parent, DupTransDialog *dt_dialog,
 }
 
 static gboolean
-gnc_dup_trans_dialog_internal (GtkWidget * parent, const char* title,
+gnc_dup_trans_dialog_internal (GtkWidget * parent,
+                               const char* window_title, const char* title,
                                gboolean show_date, time64 *date_p,
                                GDate *gdate_p, const char *num, char **out_num,
                                const char *tnum, char **out_tnum,
@@ -218,6 +219,9 @@ gnc_dup_trans_dialog_internal (GtkWidget * parent, const char* title,
         gtk_widget_grab_focus (entry);
     }
 
+    if (window_title)
+        gtk_window_set_title (GTK_WINDOW (dt_dialog->dialog), window_title);
+
     if (title)
     {
         gchar *full_text = g_strdup_printf("<b>%s</b>", title);
@@ -296,7 +300,7 @@ gnc_dup_trans_dialog (GtkWidget * parent, const char* title, gboolean show_date,
                       const char *tnum, char **out_tnum,
                       const char *tassoc, char **out_tassoc)
 {
-    return gnc_dup_trans_dialog_internal(parent, title, show_date, date_p, NULL,
+    return gnc_dup_trans_dialog_internal(parent, NULL, title, show_date, date_p, NULL,
                                          num, out_num, tnum, out_tnum, tassoc, out_tassoc);
 }
 
@@ -308,10 +312,18 @@ gnc_dup_trans_dialog_gdate (GtkWidget * parent, GDate *gdate_p,
     g_assert(gdate_p);
 
     tmp_time = gdate_to_time64 (*gdate_p);
-    return gnc_dup_trans_dialog_internal(parent, NULL, TRUE, &tmp_time, gdate_p,
+    return gnc_dup_trans_dialog_internal(parent, NULL, NULL, TRUE, &tmp_time, gdate_p,
                                          num, out_num, NULL, NULL, NULL, NULL);
 }
 
+gboolean
+gnc_dup_time64_dialog (GtkWidget * parent, const char *window_title,
+                       const char* title, time64 *date)
+{
+    return gnc_dup_trans_dialog_internal(parent, window_title, title, TRUE, date, NULL,
+                                         NULL, NULL, NULL, NULL, NULL, NULL);
+}
+
 gboolean
 gnc_dup_date_dialog (GtkWidget * parent, const char* title, GDate *gdate_p)
 {
@@ -319,6 +331,7 @@ gnc_dup_date_dialog (GtkWidget * parent, const char* title, GDate *gdate_p)
     g_assert(gdate_p);
 
     tmp_time = gdate_to_time64(*gdate_p);
-    return gnc_dup_trans_dialog_internal(parent, title, TRUE, &tmp_time, gdate_p,
+    return gnc_dup_trans_dialog_internal(parent, NULL, title, TRUE, &tmp_time, gdate_p,
                                          NULL, NULL, NULL, NULL, NULL, NULL);
 }
+

gnucash/gnome-utils/dialog-dup-trans.h

@@ -73,4 +73,19 @@ gnc_dup_trans_dialog_gdate (GtkWidget * parent, GDate *gdate_p,
 gboolean
 gnc_dup_date_dialog (GtkWidget * parent, const char* title, GDate *date);
 
+/**
+ * Opens up a window to ask for a date for the duplicated element
+ *
+ * \param parent The parent of the window to be created
+ * \param window_title The title of the dialog window
+ * \param title The text of the title label
+ * \param date  The initial time64 date to use, and the output
+ *                   parameter for the new date. Must not be NULL.
+ *
+ * \return TRUE if user closes dialog with 'OK', otherwise FALSE
+ */
+gboolean
+gnc_dup_time64_dialog (GtkWidget * parent, const char *window_title,
+                       const char* title, time64 *date);
+
 #endif // DIALOGDUPTRANS_H

gnucash/gnome/dialog-sx-editor.c

@@ -644,7 +644,8 @@ gnc_sxed_split_check_account (GncSxEditorDialog *sxed, Split *s,
                       NULL);
     acct = xaccAccountLookup (acct_guid, gnc_get_current_book ());
     guid_free (acct_guid);
-    if (acct == NULL)
+    // If the split is being destroyed always return TRUE.
+    if (acct == NULL && !qof_instance_get_destroying(s))
         return FALSE;
     split_cmdty = xaccAccountGetCommodity(acct);
     split_amount = xaccSplitGetAmount(s);

gnucash/gnome/gnc-plugin-budget.c

@@ -54,6 +54,8 @@ static void gnc_plugin_budget_cmd_open_budget (GtkAction *action,
         GncMainWindowActionData *data);
 static void gnc_plugin_budget_cmd_copy_budget (GtkAction *action,
         GncMainWindowActionData *data);
+static void gnc_plugin_budget_cmd_delete_budget (GtkAction *action,
+        GncMainWindowActionData *data);
 
 static GtkActionEntry gnc_plugin_actions [] =
 {
@@ -74,6 +76,12 @@ static GtkActionEntry gnc_plugin_actions [] =
         N_("Copy an existing Budget"),
         G_CALLBACK(gnc_plugin_budget_cmd_copy_budget)
     },
+    {
+        "DeleteBudgetAction", NULL, N_("Delete Budget"), NULL,
+        N_("Deletes an existing Budget"),
+        G_CALLBACK(gnc_plugin_budget_cmd_delete_budget)
+    },
+
 };
 static guint gnc_plugin_n_actions = G_N_ELEMENTS (gnc_plugin_actions);
 
@@ -233,6 +241,26 @@ gnc_plugin_budget_cmd_copy_budget (GtkAction *action,
         gnc_plugin_budget_cmd_new_budget (action, user_data);
 }
 
+/* user selects budget to delete */
+static void
+gnc_plugin_budget_cmd_delete_budget (GtkAction *action,
+                                     GncMainWindowActionData *user_data)
+{
+    GncBudget *bgt;
+    QofBook *book;
+
+    g_return_if_fail (user_data != NULL);
+
+    book = gnc_get_current_book ();
+    if (qof_collection_count (qof_book_get_collection (book, GNC_ID_BUDGET)) == 0)
+        return;
+
+    bgt = gnc_budget_gui_select_budget (GTK_WINDOW(user_data->window), book);
+    if (!bgt) return;
+
+    gnc_budget_gui_delete_budget (bgt);
+}
+
 /************************************************************
  *                     Other Functions                      *
  ************************************************************/

gnucash/gnome/gnc-plugin-page-register.c

@@ -51,6 +51,7 @@
 #include "gnc-plugin-business.h"
 
 #include "dialog-account.h"
+#include "dialog-dup-trans.h"
 #include "dialog-find-account.h"
 #include "dialog-find-transactions.h"
 #include "dialog-print-check.h"
@@ -3959,6 +3960,10 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
     SplitRegister* reg;
     GNCSplitReg* gsr;
     Transaction* trans, *new_trans;
+    time64 date = gnc_time (NULL);
+    GtkWidget *window;
+    Account *account;
+    Split *split;
 
     ENTER ("(action %p, page %p)", action, page);
 
@@ -3966,30 +3971,41 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction* action,
 
     priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (page);
     reg = gnc_ledger_display_get_split_register (priv->ledger);
+    window = gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (page));
     trans = gnc_split_register_get_current_trans (reg);
     if (trans == NULL)
         return;
 
     if (xaccTransGetReversedBy (trans))
     {
-        gnc_error_dialog (GTK_WINDOW (gnc_plugin_page_get_window (GNC_PLUGIN_PAGE (
+        gnc_error_dialog (GTK_WINDOW (window), "%s",
-                page))), "%s",
                           _ ("A reversing entry has already been created for this transaction."));
         return;
     }
 
-    qof_event_suspend();
+    split = gnc_split_register_get_current_split (reg);
+    account = xaccSplitGetAccount (split);
+
+    if (!gnc_dup_time64_dialog (window, _("Reverse Transaction"),
+                                _("New Transaction Information"), &date))
+    {
+        LEAVE ("reverse cancelled");
+        return;
+    }
+
+    gnc_suspend_gui_refresh();
     new_trans = xaccTransReverse (trans);
 
     /* Clear transaction level info */
-    xaccTransSetDatePostedSecsNormalized (new_trans, gnc_time (NULL));
+    xaccTransSetDatePostedSecsNormalized (new_trans, date);
     xaccTransSetDateEnteredSecs (new_trans, gnc_time (NULL));
 
-    qof_event_resume();
+    gnc_resume_gui_refresh();
 
     /* Now jump to new trans */
     gsr = gnc_plugin_page_register_get_gsr (GNC_PLUGIN_PAGE (page));
-    gnc_split_reg_jump_to_split (gsr, xaccTransGetSplit (new_trans, 0));
+    split = xaccTransFindSplitByAccount(new_trans, account);
+    gnc_split_reg_jump_to_split (gsr, split);
     LEAVE (" ");
 }
 

gnucash/gnome/window-reconcile.c

@@ -251,6 +251,16 @@ recn_get_account (RecnWindow *recnData)
 }
 
 
+static void
+gnc_add_colorized_amount (gpointer obj, gnc_numeric amt,
+                          GNCPrintAmountInfo print_info, gboolean reverse)
+{
+    if (!obj) return;
+    if (reverse) amt = gnc_numeric_neg (amt);
+    gnc_set_label_color (GTK_WIDGET (obj), amt);
+    gtk_label_set_text (GTK_LABEL (obj), xaccPrintAmount (amt, print_info));
+}
+
 /********************************************************************\
  * recnRecalculateBalance                                           *
  *   refreshes the balances in the reconcile window                 *
@@ -263,7 +273,6 @@ static gnc_numeric
 recnRecalculateBalance (RecnWindow *recnData)
 {
     Account *account;
-    const char *amount;
     gnc_numeric debit;
     gnc_numeric credit;
     gnc_numeric starting;
@@ -279,73 +288,33 @@ recnRecalculateBalance (RecnWindow *recnData)
         return gnc_numeric_zero ();
 
     reverse_balance = gnc_reverse_balance(account);
-
-    /* update the starting balance */
     include_children = xaccAccountGetReconcileChildrenStatus(account);
     starting = gnc_ui_account_get_reconciled_balance(account, include_children);
     print_info = gnc_account_print_info (account, TRUE);
 
-    /*
-     * Do not reverse the balance here.  It messes up the math in the
-     * reconciliation window.  Also, the balance should show up as a
-     * positive number in the reconciliation window to match the positive
-     * number that shows in the register window.
-     */
-
-    amount = xaccPrintAmount(starting, print_info);
-    gnc_set_label_color(recnData->starting, starting);
-    gtk_label_set_text(GTK_LABEL(recnData->starting), amount);
-    if (reverse_balance)
-        starting = gnc_numeric_neg (starting);
-
-    /* update the statement date */
-    amount = qof_print_date(recnData->statement_date);
-    gtk_label_set_text(GTK_LABEL(recnData->recn_date), amount);
-
-    /* update the ending balance */
     ending = recnData->new_ending;
-    if (reverse_balance)
-        ending = gnc_numeric_neg (ending);
-    amount = xaccPrintAmount(ending, print_info);
-    gnc_set_label_color(recnData->ending, ending);
-    gtk_label_set_text(GTK_LABEL(recnData->ending), amount);
-    if (reverse_balance)
-        ending = gnc_numeric_neg (ending);
-
     debit = gnc_reconcile_view_reconciled_balance
             (GNC_RECONCILE_VIEW(recnData->debit));
-
     credit = gnc_reconcile_view_reconciled_balance
              (GNC_RECONCILE_VIEW(recnData->credit));
 
-    /* Update the total debit and credit fields */
+    reconciled = gnc_numeric_sub_fixed (debit, credit);
-    amount = xaccPrintAmount(debit, print_info);
-    gtk_label_set_text(GTK_LABEL(recnData->total_debit), amount);
-
-    amount = xaccPrintAmount(credit, print_info);
-
-    gtk_label_set_text(GTK_LABEL(recnData->total_credit), amount);
-
-    /* update the reconciled balance */
-    reconciled = gnc_numeric_add_fixed (starting,
-                                        gnc_numeric_sub_fixed (debit, credit));
     if (reverse_balance)
-        reconciled = gnc_numeric_neg (reconciled);
+        reconciled = gnc_numeric_sub_fixed (reconciled, starting);
-    amount = xaccPrintAmount(reconciled, print_info);
+    else
-    gnc_set_label_color(recnData->reconciled, reconciled);
+        reconciled = gnc_numeric_add_fixed (reconciled, starting);
-    gtk_label_set_text(GTK_LABEL(recnData->reconciled), amount);
-    if (reverse_balance)
-        reconciled = gnc_numeric_neg (reconciled);
 
-    /* update the difference */
     diff = gnc_numeric_sub_fixed (ending, reconciled);
-    if (reverse_balance)
+
-        diff = gnc_numeric_neg (diff);
+    gtk_label_set_text(GTK_LABEL(recnData->recn_date),
-    amount = xaccPrintAmount(diff, print_info);
+                       qof_print_date(recnData->statement_date));
-    gnc_set_label_color(recnData->difference, diff);
+
-    gtk_label_set_text(GTK_LABEL(recnData->difference), amount);
+    gnc_add_colorized_amount (recnData->starting, starting, print_info, FALSE);
-    if (reverse_balance)
+    gnc_add_colorized_amount (recnData->ending, ending, print_info, reverse_balance);
-        diff = gnc_numeric_neg (diff);
+    gnc_add_colorized_amount (recnData->total_debit, debit, print_info, FALSE);
+    gnc_add_colorized_amount (recnData->total_credit, credit, print_info, FALSE);
+    gnc_add_colorized_amount (recnData->reconciled, reconciled, print_info, reverse_balance);
+    gnc_add_colorized_amount (recnData->difference, diff, print_info, reverse_balance);
 
     action = gtk_action_group_get_action (recnData->action_group,
                                           "RecnFinishAction");

gnucash/import-export/import-account-matcher.c

@@ -320,6 +320,54 @@ account_tree_row_changed_cb (GtkTreeSelection *selection,
         gtk_widget_hide (GTK_WIDGET(picker->whbox)); // hide the warning
 }
 
+static gboolean
+account_tree_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+    // Expand the tree when the user starts typing, this will allow sub-accounts to be found.
+    if (event->length == 0)
+        return FALSE;
+    
+    switch (event->keyval)
+    {
+        case GDK_KEY_plus:
+        case GDK_KEY_minus:
+        case GDK_KEY_asterisk:
+        case GDK_KEY_slash:
+        case GDK_KEY_KP_Add:
+        case GDK_KEY_KP_Subtract:
+        case GDK_KEY_KP_Multiply:
+        case GDK_KEY_KP_Divide:
+        case GDK_KEY_Up:
+        case GDK_KEY_KP_Up:
+        case GDK_KEY_Down:
+        case GDK_KEY_KP_Down:
+        case GDK_KEY_Home:
+        case GDK_KEY_KP_Home:
+        case GDK_KEY_End:
+        case GDK_KEY_KP_End:
+        case GDK_KEY_Page_Up:
+        case GDK_KEY_KP_Page_Up:
+        case GDK_KEY_Page_Down:
+        case GDK_KEY_KP_Page_Down:
+        case GDK_KEY_Right:
+        case GDK_KEY_Left:
+        case GDK_KEY_KP_Right:
+        case GDK_KEY_KP_Left:
+        case GDK_KEY_space:
+        case GDK_KEY_KP_Space:
+        case GDK_KEY_backslash:
+        case GDK_KEY_Return:
+        case GDK_KEY_ISO_Enter:
+        case GDK_KEY_KP_Enter:
+            return FALSE;
+            break;
+        default:
+            gtk_tree_view_expand_all (GTK_TREE_VIEW(user_data));
+            return FALSE;
+    }
+    return FALSE;
+}
+
 
 /*******************************************************
  * account_tree_row_activated_cb
@@ -427,10 +475,13 @@ Account * gnc_import_select_account(GtkWidget *parent,
         }
         gtk_label_set_text((GtkLabel*)online_id_label, account_description_text);
         build_acct_tree(picker);
-
         gtk_window_set_modal(GTK_WINDOW(picker->dialog), TRUE);
         g_signal_connect(picker->account_tree, "row-activated",
                          G_CALLBACK(account_tree_row_activated_cb), picker);
+        
+        /* Connect key press event so we can expand the tree when the user starts typing, allowing
+        * any subaccount to match */
+        g_signal_connect (picker->account_tree, "key-press-event", G_CALLBACK (account_tree_key_press_cb), picker->account_tree);
 
         selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(picker->account_tree));
         g_signal_connect(selection, "changed",

gnucash/report/reports/standard/receipt.scm

@@ -29,38 +29,6 @@
 (use-modules (srfi srfi-13)) ; for extra string functions
 (use-modules (ice-9 format)) ; for number formatting
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; Report-specific routines
-
-(define (taxrate taxable taxtable curr)
-  ;; Display the tax rate applicable to an invoice line.
-  ;; This may be e.g. "15%" or "£5.00" or "15% + £5.00" or "n/a"
-  ;; depending on how complicated the tax table is.
-  ;; (When called from within the eguile template, anything
-  ;; (display)ed becomes part of the HTML string.)
-  (if (or (not taxable) (eq? taxtable '()))
-    (display " ")
-    (let* ((amttot  (gnc:make-commodity-collector))
-           (pctot   (gnc:make-value-collector))
-           (entries (gncTaxTableGetEntries taxtable))
-           (amt?    #f)  ; becomes #t if any entries are amounts
-           (pc?     #f)) ; becomes #t if any entries are percentages
-      (for entry in entries do
-          (let ((tttype (gncTaxTableEntryGetType   entry))
-                (ttamt  (gncTaxTableEntryGetAmount entry)))
-            (if (equal? tttype GNC-AMT-TYPE-VALUE)
-              (begin
-                (set! amt? #t)
-                (amttot 'add curr ttamt))
-              (begin
-                (set! pc? #t)
-                (pctot 'add ttamt)))))
-      (if pc? (begin (display (fmtnumeric (pctot 'total #f))) (display "%")))
-      (if (and amt? pc?) (display " + "))        ; both - this seems unlikely in practice
-      (if amt?
-        (display-comm-coll-total amttot #f))
-      (if (and (not amt?) (not pc?)) (display (_ "n/a"))))))        ; neither
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Define all the options
 
@@ -97,20 +65,6 @@
 (define optname-extra-notes    (N_ "Extra notes"))
 (define optname-date-format    (N_ "Today date format"))
 
-; Choose only customer invoices
-; (This doesn't work very nicely -- all invoices and bills
-;  are offered for selection, but if a non-customer invoice
-;  is selected, the user is dumped back to viewing the
-;  previous invoice (or none) with no error message)
-(define (customers-only invoice)
-  (let* ((owner     (gncInvoiceGetOwner  invoice))
-         (endowner  (gncOwnerGetEndOwner owner))
-         (ownertype (gncOwnerGetType     endowner)))
-    ;(gnc:debug "ownertype is ")(gnc:debug ownertype)
-    (if (eqv? ownertype GNC-OWNER-CUSTOMER)
-      (list #t invoice)
-      (list #f invoice))))
-
 (define (options-generator)
   ;; Options
   (define report-options (gnc:new-options))
@@ -120,8 +74,7 @@
   (add-option
     (gnc:make-invoice-option ; defined in gnucash/scm/business-options.scm
       generalpage optname-invoice-number
-      "a" "" (lambda () '())
+      "a" "" (lambda () '()) #f))
-      #f))        ;customers-only)) ;-- see above
 
   ;; Display options
   (add-option (gnc:make-string-option displaypage optname-template-file "a"

gnucash/ui/gnc-plugin-budget-ui.xml

@@ -6,6 +6,7 @@
           <menuitem name="BudgetNewBudget" action="NewBudgetAction"/>
           <menuitem name="BudgetOpenBudget" action="OpenBudgetAction"/>
           <menuitem name="BudgetCopyBudget" action="CopyBudgetAction"/>
+          <menuitem name="BudgetDeleteBudget" action="DeleteBudgetAction"/>
         </menu>
       </placeholder>
     </menu>

libgnucash/app-utils/fin.scm

@@ -289,8 +289,7 @@
 ;; The payment number (n) must be non-negative for amort_balance.  (In this
 ;;  case, payment zero is at the _beginning_ of the first period, so
 ;;  amort_balance will just be the initial balance.)
-;; If the above conditions on n are violated, the functions return -1 (#f is
+;; If the above conditions on n are violated, the functions returns #f
-;;  not used, because it causes gnucash to crash).
 ;;
 ;; A negative interest rate works (if you can find a lender who charges
 ;;  negative rates), but negative compounding frequency, or negative payment
@@ -298,29 +297,44 @@
 
 ;; Calculate the balance remaining after the nth payment
 ;; (n must be greater than or equal to zero)
+(define (gnc:amort_balance py cy iy pv pmt n places)
+  (cond
+    ((< pv 0) 0)
+    ((< n 0) #f)
+    ((and (zero? pv) (>= pmt 0)) 0)
+    ((zero? n) pv)
+    (else
+      (let* ((bal-after-int (amort_balanceAfterInterest pv py cy iy places))
+            (bal-after-pmt (amort_balanceAfterPayment bal-after-int pmt)))
+        (gnc:amort_balance py cy iy bal-after-pmt pmt (- n 1) places)))))
+
+;; Calculate the size of the nth payment
+;; (it will just be pmt for all the payments before the final payment,
+;; then less,
+;; then zero if you keep trying to make payments)
+;; (n must be greater than zero)
 (define (gnc:amort_pmt py cy iy pv pmt n places)
-  (if (< n 1) -1 ;; Returning #f here causes gnucash to crash on startup
+  (and (>= n 1)
-    (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+       (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
-           (balBeforePayment
+              (balBeforePayment (amort_balanceAfterInterest prevBal py cy iy places))
-		     (amort_balanceAfterInterest prevBal py cy iy places))
+              (balAfterPayment (amort_balanceAfterPayment balBeforePayment pmt)))
-           (balAfterPayment (amort_balanceAfterPayment balBeforePayment pmt)))
+         (- balBeforePayment balAfterPayment))))
-      (- balBeforePayment balAfterPayment))))
 
 ;; Calculate the amount of the nth payment that is principal
 ;; (n must be greater than zero)
 (define (gnc:amort_ppmt py cy iy pv pmt n places)
-  (if (< n 1) -1
+  (and (>= n 1)
-    (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
+       (let* ((prevBal (gnc:amort_balance py cy iy pv pmt (- n 1) places))
-	       (bal-after-int (amort_balanceAfterInterest prevBal py cy iy places))
+              (bal-after-int (amort_balanceAfterInterest prevBal py cy iy places))
-           (newBal (amort_balanceAfterPayment bal-after-int pmt)))
+              (newBal (amort_balanceAfterPayment bal-after-int pmt)))
-      (- prevBal newBal))))
+         (- prevBal newBal))))
 
 ;; Calculate the amount of the nth payment that is interest
 ;; (n must be greater than zero)
 (define (gnc:amort_ipmt py cy iy pv pmt n places)
-  (if (< n 1) -1
+  (and (>= n 1)
-    (let* ((prevBal(gnc:amort_balance py cy iy pv pmt (- n 1) places)))
+       (amort_interest (gnc:amort_balance py cy iy pv pmt (- n 1) places)
-      (amort_interest prevBal py cy iy places))))
+                       py cy iy places)))
 
 ;; "Private" helper functions:
 

libgnucash/app-utils/gnc-exp-parser.c

@@ -344,6 +344,12 @@ func_op(const char *fname, int argc, void **argv)
         return NULL;
     }
 
+    if (!scm_is_number (scmTmp))
+    {
+        PERR("function gnc:%s does not return a number", fname);
+        return NULL;
+    }
+
     result = g_new0( gnc_numeric, 1 );
     *result = double_to_gnc_numeric( scm_to_double(scmTmp),
                                      GNC_DENOM_AUTO,

po/glossary/CMakeLists.txt

@@ -3,5 +3,5 @@
 # de_CH got abandoned as a separate gnucash language.
 # So we do not distribute them in the tarball.
 
-set_dist_list(po_glossary_DIST CMakeLists.txt bg.po ca.po da.po de.po el.po es_NI-policy.txt es.po fr.po gnc-glossary.txt he.po
+set_dist_list(po_glossary_DIST CMakeLists.txt bg.po ca.po da.po de.po el.po es_NI-policy.txt es.po fi.po fr.po gnc-glossary.txt he.po
         hr.po hu.po it.po nb.po nl.po pl.po pt_BR.po pt.po ru.po rw.po sk.po sv.po txt-to-pot.sh vi.po zh_CN.po zh_TW.po)

po/glossary/fi.po

@@ -0,0 +1,799 @@
+# Finnish messages for gnucash-glossary.
+# Copyright (C) 2020 Free Software Foundation, Inc.
+# Marko Kohtala <marko.kohtala@gmail.com>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: GnuCash 3.10\n"
+"POT-Creation-Date: 2020-03-27 21:58+0100\n"
+"PO-Revision-Date: 2020-04-18 20:54+0300\n"
+"Last-Translator: Marko Kohtala <marko.kohtala@gmail.com>\n"
+"Language-Team: \n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\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!)"
+msgstr ""
+
+#. "A detailed record of money spent and received"
+msgid "account"
+msgstr "tili"
+
+#. "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."
+msgid "account code"
+msgstr "tilinumero"
+
+#. "the tree view of all accounts"
+msgid "account hierarchy"
+msgstr "tilihierarkia"
+
+#. "-"
+msgid "account name"
+msgstr "tilin nimi"
+
+#. "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"
+msgid "account type: Active"
+msgstr "tilityyppi: Aktiivinen"
+
+#. "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 "tilityyppi: Vastaavaa"
+
+#. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'"
+msgid "account type: Assets & Liabilities"
+msgstr "tilityyppi: Taselaskelma"
+
+#. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice"
+msgid "account type: checking"
+msgstr "tilityyppi: pankkitili"
+
+#. "-"
+msgid "account type: currency"
+msgstr "tilityyppi: valuutta"
+
+#. "see: Equity, but see also 'account type: Passive'"
+msgid "account type: Equity"
+msgstr "tilityyppi: Oma pääoma"
+
+#. "-"
+msgid "account type: Expense"
+msgstr "tilityyppi: Kulu"
+
+#. "-"
+msgid "account type: Income"
+msgstr "tilityyppi: Tulo"
+
+#. "A debt, a financial obligation, but see also 'account type: Passive'"
+msgid "account type: Liability"
+msgstr "tilityyppi: Vastattavaa"
+
+#. "-"
+msgid "account type: money-market"
+msgstr "tilityyppi: rahamarkkina"
+
+#. "-"
+msgid "account type: Mutual fund"
+msgstr "tilityyppi: Sijoitusrahasto"
+
+#. "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"
+msgid "account type: Passive"
+msgstr "tilityyppi: Passiivinen"
+
+#. "Group of accounts tracking your success, complement of 'Assets & Liabilities'"
+msgid "account type: Profit & Loss"
+msgstr "tilityyppi: Tuloslaskelma"
+
+#. "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 "tilityyppi: talletus"
+
+#. "-"
+msgid "account type: Stock"
+msgstr "tilityyppi: Osake"
+
+#. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another"
+msgid "account type: trading"
+msgstr "tilityyppi: kaupankäynti"
+
+#. "-"
+msgid "account: parent account"
+msgstr "tilityyppi: ylätili"
+
+#. "-"
+msgid "account: subaccount"
+msgstr "tilityyppi: alatili"
+
+#. "-"
+msgid "account: top level account"
+msgstr "tilityyppi: päätili"
+
+#. "The process of doing something that caused a transaction to happen"
+msgid "Action (register)"
+msgstr "Tapahtuma (tilikirja)"
+
+#. "Automated teller machine"
+msgid "action: ATM"
+msgstr "tapahtuma: käteisautomaatti"
+
+#. "Transaction was an auto deposit"
+msgid "action: autoDep"
+msgstr "tapahtuma: automaattitalletus"
+
+#. "-"
+msgid "action: buy"
+msgstr "tapahtuma: osto"
+
+#. "-"
+msgid "action: deposit"
+msgstr "tapahtuma: talletus"
+
+#. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit."
+msgid "action: direct debit"
+msgstr "tapahtuma: suora nosto"
+
+#. "transaction is a distribution (???)"
+msgid "action: dist"
+msgstr "tapahtuma: jako"
+
+#. "transaction is a dividend"
+msgid "action: div"
+msgstr "tapahtuma: osinko"
+
+#. "-"
+msgid "action: fee"
+msgstr "tapahtuma: palkkio"
+
+#. "transaction comes from interest"
+msgid "action: int"
+msgstr "tapahtuma: korko"
+
+#. "-"
+msgid "action: loan"
+msgstr "tapahtuma: laina"
+
+#. "see: payment 1."
+msgid "action: payment"
+msgstr "tapahtuma: maksu"
+
+#. "Point of sale"
+msgid "action: POS"
+msgstr "tapahtuma: myyntipiste"
+
+#. "-"
+msgid "action: rebate"
+msgstr "tapahtuma: alennus"
+
+#. "-"
+msgid "action: sell"
+msgstr "tapahtuma: myynti"
+
+#. "-"
+msgid "action: Teller"
+msgstr "tapahtuma: Pankkiiri"
+
+#. "see: transfer 2. (=credit transfer)"
+msgid "action: transfer"
+msgstr "tapahtuma: siirto"
+
+#. "-"
+msgid "action: wire"
+msgstr "tapahtuma: sähke"
+
+#. "-"
+msgid "action: withdraw"
+msgstr "tapahtuma: nosto"
+
+#. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
+msgid "aging"
+msgstr "erääntyminen"
+
+#. "A sum of money"
+msgid "amount"
+msgstr "summa"
+
+#. "The result of adding several amounts together and then dividing this total by the number of amounts"
+msgid "average"
+msgstr "keskiarvo"
+
+#. "The amount of money that is in one's account"
+msgid "balance (noun)"
+msgstr "saldo"
+
+#. "Balance brought forward - usually the first entry of an account statement containing the 'balance c/f' of the previous billing period or page"
+#, fuzzy
+msgid "balance b/f"
+msgstr "alkusaldo"
+
+#. "Balance carried forward - usually the last entry of an account statement to be used as 'balance b/f' on the next billing period or page"
+#, fuzzy
+msgid "balance c/f"
+msgstr "loppusaldo"
+
+#. "A written record of money received and paid out, showing the difference between the two total amounts"
+msgid "balance sheet"
+msgstr "tase"
+
+#. "To arrange for income and spending to be equal"
+msgid "balance, to"
+msgstr "tasata"
+
+#. "-"
+msgid "bank"
+msgstr "pankki"
+
+#. "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 "ostolasku"
+
+#. "see invoice owner"
+msgid "bill owner"
+msgstr "ostolaskun omistaja"
+
+#. "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"
+msgstr "maksuehdot"
+
+#. "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 "Kirjanpito"
+
+#. "Completing the records of financial affairs for a specific time period, e.g. at the end of the year."
+msgid "book closing"
+msgstr "tilinpäätös"
+
+#. "An estimate or plan of the money available to somebody and how it will be spent over a period of time."
+msgid "Budget"
+msgstr "Budjetti"
+
+#. "-"
+msgid "business (adjective)"
+msgstr "liiketoiminta"
+
+#. "as Menu Item: Headline for features that are related to small business accounting"
+msgid "business (noun)"
+msgstr "yritys"
+
+#. "Profits made from the sale of investments or property"
+msgid "capital gains"
+msgstr "pääomatulo"
+
+#. "Distinguishing the uppercase and lowercase letters"
+msgid "case sensitive"
+msgstr "merkkikokoriippuvainen"
+
+#. "Money in coins or notes"
+msgid "cash"
+msgstr "käteinen"
+
+#. "(esp. US) (= cheque) A special printed form on which one writes an order to a bank to pay a sum of money from one's account to another person"
+msgid "check"
+msgstr "šekki"
+
+#. "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 "tarkista ja korjaa"
+
+#. "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 "sulje"
+
+#. "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 "hyödyke"
+
+#. "e.g. NASDAQ"
+msgid "commodity listing"
+msgstr "hyödykeluettelo"
+
+#. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)"
+msgid "commodity option: fraction"
+msgstr "hyödykeasetus: pienin osa"
+
+#. "e.g. USD, DEM"
+msgid "commodity option: Symbol"
+msgstr "hyödykeasetus: Tunnus"
+
+#. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit."
+msgid "compound interests"
+msgstr "koronkorko"
+
+#. "(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 "Kredit"
+
+#. "-"
+msgid "Credit Card"
+msgstr "Luottokortti"
+
+#. "A transfer of money direct from one bank account to another, without using a cheque"
+msgid "credit transfer"
+msgstr "tilisiirto"
+
+#. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice"
+msgid "credit note"
+msgstr "hyvityslasku"
+
+#. "The system of money used in a country"
+msgid "currency"
+msgstr "valuutta"
+
+#. "Custom print format (i.e. according to the user's wishes) as opposed to a template choice."
+msgid "Custom"
+msgstr "Mukautettu"
+
+#. "The backend where the data is stored."
+msgid "database"
+msgstr "tietokanta"
+
+#. "A specific numbered day of the month"
+msgid "Date"
+msgstr "Päiväys"
+
+#. "DD/MM/YY or MM/DD/YY or something else"
+msgid "date format"
+msgstr "päivämäärän muoto"
+
+#. "A range in time that is delimited by two distinct dates."
+msgid "date range"
+msgstr "aikaväli"
+
+#. "(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 "Debet"
+
+#. "Each option has a default setting that it is shipped with, until the user changes the setting."
+msgid "default"
+msgstr "oletus"
+
+#. "see credit"
+msgid "deposit (in the reconcile dialog)"
+msgstr "pano"
+
+#. "The process of something becoming less valuable"
+msgid "depreciation"
+msgstr "poisto"
+
+#. "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 "Selite"
+
+#. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)."
+msgid "discount"
+msgstr "alennus"
+
+#. "Important Buzzword :)"
+msgid "double entry"
+msgstr "kahdenkertainen"
+
+#. "a person who works for somebody or a company in return for wages"
+msgid "employee"
+msgstr "työntekijä"
+
+#. "1. The money value of a property after all charges on it have been paid. Equity isn't debt, it's a representation of long-term capital (So combining it with liability isn't really very meaningful, except in the balance sheet. 2. (a) The value of the shares issued by  a company. (b) Ordinary stocks and shares that carry no fixed interest."
+msgid "equity"
+msgstr "oma pääoma"
+
+#. "Report that ... FIXME: Add description."
+msgid "equity statement"
+msgstr "taselaskelma"
+
+#. "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 "sulkutili"
+
+#. "The relation in value between the money used in different countries"
+msgid "exchange rate"
+msgstr "vaihtokurssi"
+
+#. "in the account creation dialog??"
+msgid "field"
+msgstr "kenttä"
+
+#. "Any piece of information (text, graphics, executable) put together and given a name. All the information you have on the hard drive is arranged as a collection of  files."
+msgid "file"
+msgstr "tiedosto"
+
+#. "-"
+msgid "file type"
+msgstr "tiedostotyyppi"
+
+#. "-"
+msgid "financial calculator: interest rate"
+msgstr "talouslaskin: korkoprosentti"
+
+#. "see: payment"
+msgid "financial calculator: payments"
+msgstr "talouslaskin: maksut"
+
+#. "An increase in wealth; profit; advantage (See also: capital gains)"
+msgid "gain"
+msgstr "tulo"
+
+#. "Name of an automatically created account to get imbalanced transactions back in balance"
+msgid "imbalance"
+msgstr "epätasapaino"
+
+#. "Process of extracting data from a non-Gnucash format into a Gnucash file. E.g. QIF Import."
+msgid "import"
+msgstr "tuonti"
+
+#. "Report that ... FIXME: add description. This report used to be called the 'Profit & Loss', but it was renamed on 2004-07-13."
+msgid "income statement"
+msgstr "tuloslaskelma"
+
+#. "Money charged for borrowing money, or paid to somebody who invests money"
+msgid "interest"
+msgstr "korko"
+
+#. "A list of goods sold or services provided together with the prices charged; see also: a bill. In Gnucash, an 'invoice' is a statement that we sent out (to a customer), whereas a 'bill' is one that we received (from a vendor)."
+msgid "invoice"
+msgstr "myyntilasku"
+
+#. "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."
+msgid "job"
+msgstr "hanke"
+
+#. "A book in which a bank, business firm, etc. records its financial accounts"
+msgid "ledger"
+msgstr "tilikirja"
+
+#. "The heading for the right side of the balance sheet. See also: Equity."
+msgid "liabilities/equity"
+msgstr "vastattavat/oma pääoma"
+
+#. "A sum of money that is lent (by a bank)"
+msgid "loan"
+msgstr "laina"
+
+#. "The money lost in business activity"
+msgid "loss"
+msgstr "meno"
+
+#. "name of an automatically created account"
+msgid "Lost Accounts"
+msgstr "Kadotetut tilit"
+
+#. "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 "Erä"
+
+#. "Combine two books into one (see book)."
+msgid "merge, to"
+msgstr ""
+
+#. "The thing that the scatter plot uses to mark each data point"
+msgid "marker"
+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 ""
+
+#. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
+msgid "MDI modus"
+msgstr ""
+
+#. "One textfield per split that should help you remember what this split was about."
+msgid "Memo"
+msgstr "Erittely"
+
+#. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way."
+msgid "Mortgage"
+msgstr ""
+
+#. "e.g. USD, DEM, see Currency."
+msgid "national currency"
+msgstr ""
+
+#. "(of money) remaining when nothing more is to be taken away"
+msgid "net"
+msgstr "netto"
+
+#. "net total of all assets"
+msgid "net assets"
+msgstr ""
+
+#. "The total income minus the total expenses of a given time period."
+msgid "net profit"
+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."
+msgid "net worth"
+msgstr ""
+
+#. "One textfield per transaction that can hold explanatory text about the transaction."
+msgid "notes (register)"
+msgstr "huomautukset"
+
+#. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field."
+msgid "Num (column in register)"
+msgstr "Num"
+
+#. "to make accessible"
+msgid "open, to"
+msgstr "avata"
+
+#. "If an account starts with a non-zero balance, then this amount is called the opening balance."
+msgid "opening balance"
+msgstr "avaussaldo"
+
+# asetukset?
+#. "A menu choice in the graphical user interface that allows the user to specify how the application will act each time it is used. "
+msgid "options"
+msgstr "valinnat"
+
+#. "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 ""
+
+#. "Name of an automatically created account that holds splits that have no account."
+msgid "orphan"
+msgstr "orporivit"
+
+#. "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 ""
+
+#. "A secret phrase that one needs to know in order to get access to a user account "
+msgid "passphrase"
+msgstr ""
+
+#. "An amount that must be paid / An amount for which money has not yet been received"
+msgid "Payables/Receivables"
+msgstr "Velat/Saatavat"
+
+#. "A person to whom sth is paid"
+msgid "payee"
+msgstr "mansunsaaja"
+
+#. "A person who pays or who has to pay for sth"
+msgid "payer"
+msgstr "maksaja"
+
+#. "1. The action of paying sb/sth or of being paid. 2. A sum of money paid."
+msgid "payment"
+msgstr "maksu"
+
+#. "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 "koontitili"
+
+#. "A set of investments owned by a person"
+msgid "portfolio"
+msgstr ""
+
+#. "Register invoice, voucher in account register"
+msgid "post, to"
+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"
+msgid "principal payment"
+msgstr "lyhennys"
+
+#. "An amount of money for which sth may be bought or sold"
+msgid "price (in a split)"
+msgstr "hinta (rivillä)"
+
+#. "An ask is an offer to sell, and the price you want to sell at."
+msgid "price type: ask"
+msgstr ""
+
+#. "A bid is an offer to buy, and the price you want to buy at."
+msgid "price type: bid"
+msgstr ""
+
+#. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities"
+msgid "price: quotes"
+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 "voitto"
+
+#. "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 "Tuloslaskelma"
+
+#. "-"
+msgid "quick-fill"
+msgstr ""
+
+#. "-"
+msgid "rebalance, to (a transaction)"
+msgstr "tasaa"
+
+#. "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."
+msgid "reconcile, to"
+msgstr "täsmäyttää"
+
+#. "-"
+msgid "record keeping"
+msgstr ""
+
+#. "A list of items; a book containing such a list"
+msgid "register"
+msgstr "tilikirja"
+
+#. "A transaction that is divided into two or more parts"
+msgid "register entry: split transaction"
+msgstr ""
+
+#. "-"
+msgid "register entry: stock split"
+msgstr ""
+
+#. "one form of register"
+msgid "register: auto-split ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: basic ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: general ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: transaction journal"
+msgstr "rekisteri: pääkirja"
+
+#. "reload the current document"
+msgid "reload, to"
+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 ""
+
+#. "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 ""
+
+#. "name of an equity account (?); to be distinguished from the opening balance."
+msgid "Retained Earnings"
+msgstr "Kertyneet voittovarat"
+
+#. "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 ""
+
+#. "(In the customer summary report) The total amount of money received because something was sold."
+msgid "sales"
+msgstr ""
+
+#. "To write data (typically a file) to a storage medium, such as a disk or tape."
+msgid "save, to (to a file)"
+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."
+msgid "Scheduled Transaction"
+msgstr "Tositteen ajastus"
+
+#. "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."
+msgid "scrub, to"
+msgstr ""
+
+#. "A document or certificate showing who owns shares"
+msgid "security"
+msgstr "arvopaperi"
+
+#. "-"
+msgid "Share Balance (register)"
+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 "osakkeet"
+
+#. "(of a price) A place wfrom which sth comes or is obtained"
+msgid "source"
+msgstr ""
+
+#. "One of the two or several parts a transaction is divided into"
+msgid "split"
+msgstr "rivi"
+
+#. "This sets the particular design or shape of a report."
+msgid "style sheet"
+msgstr ""
+
+#. "The total of a set of figures that are part of a larger group of figures"
+msgid "subtotal"
+msgstr "välisumma"
+
+#. "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"
+msgid "tax code"
+msgstr ""
+
+#. "field of an account"
+msgid "tax info"
+msgstr ""
+
+#. "if you create a new e.g. style sheet, you can start from a template"
+msgid "template"
+msgstr ""
+
+#. "see: date range"
+msgid "time period"
+msgstr ""
+
+#. "as abbreviation for Total"
+msgid "Tot"
+msgstr ""
+
+#. "The full number or amount: total of some balances, of any account's running balance etc."
+msgid "total"
+msgstr "summa"
+
+# If not split transaction, and looking at only one account, it could be "tilisiirto"
+#. "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 "tosite"
+
+#. "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"
+msgstr "hyväksytty"
+
+#. "-"
+msgid "transaction state: frozen"
+msgstr "jäädytetty"
+
+#. "A transaction that was reconciled with the bank's statement."
+msgid "transaction state: reconciled"
+msgstr "tositteen tila: täsmäytetty"
+
+#. "A transaction that is void i.e. not valid (anymore)."
+msgid "transaction state: voided"
+msgstr "tositteen tila: mitätöity"
+
+#. "1. The action of transferring sth. 2. see: credit transfer"
+msgid "transfer (noun)"
+msgstr "siirto"
+
+#. "The account where an amount is transferred to"
+msgid "transfer account"
+msgstr ""
+
+#. "To move money from one account to another. Will create a transaction."
+msgid "transfer, to (register 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."
+msgid "trial balance (report)"
+msgstr ""
+
+#. "A class or things that have characteristics in common; type of an account, of a commodity etc."
+msgid "type"
+msgstr "tyyppi"
+
+#. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format."
+msgid "units"
+msgstr ""
+
+#. "-"
+msgid "URL"
+msgstr ""
+
+#. "The worth of sth in terms of money or other commodities for which it can be exchanged"
+msgid "value (in a split)"
+msgstr ""
+
+#. "In small business accounting: A person or company that sells items and is supplying goods"
+msgid "vendor"
+msgstr "toimittaja"
+
+#. "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 "matkalasku"
+
+#. "see debit"
+msgid "withdraw (in the reconcile dialog)"
+msgstr ""

po/glossary/hr.po

@@ -1,12 +1,12 @@
 # Croatian translation of GNUCash glossary.
 # Copyright (C) 2019 Free Software Foundation, Inc.
-# Milo Ivir <mail@milotype.de>, 2019.
+# Milo Ivir <mail@milotype.de>, 2019., 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GnuCash 3.4\n"
+"Project-Id-Version: GnuCash Glossary 3.10\n"
 "POT-Creation-Date: 2020-03-27 21:58+0100\n"
-"PO-Revision-Date: 2019-03-24 11:37+0100\n"
+"PO-Revision-Date: 2020-04-17 17:25+0200\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
 "Language-Team: \n"
 "Language: hr\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.3\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!)"
 msgstr ""
-"Izraz (Dragi prevoditelji: ova datoteka nikada neće biti prikazana korisniku "
+"Izraz (Napomena za prevodioce: ova datoteka služi isključivo kao pomoć pri "
-"programa!)"
+"prevođenju i nikada se neće prikazati korisniku programa!)"
 
 #. "A detailed record of money spent and received"
 msgid "account"
@@ -193,7 +193,7 @@ msgstr "radnja: isplata"
 
 #. "As in: payable aging, or: receivable aging. The aging report categorizes payables or receivables based on time buckets. This gives an overview of which bills or invoices are overdue at which time in the future. "
 msgid "aging"
-msgstr ""
+msgstr "razvoj"
 
 #. "A sum of money"
 msgid "amount"
@@ -208,14 +208,12 @@ msgid "balance (noun)"
 msgstr "saldo"
 
 #. "Balance brought forward - usually the first entry of an account statement containing the 'balance c/f' of the previous billing period or page"
-#, fuzzy
 msgid "balance b/f"
-msgstr "bilanciraj"
+msgstr "preuzet prethodni saldo"
 
 #. "Balance carried forward - usually the last entry of an account statement to be used as 'balance b/f' on the next billing period or page"
-#, fuzzy
 msgid "balance c/f"
-msgstr "bilanciraj"
+msgstr "saldo za prijenos"
 
 #. "A written record of money received and paid out, showing the difference between the two total amounts"
 msgid "balance sheet"
@@ -800,6 +798,3 @@ msgstr "vaučer"
 #. "see debit"
 msgid "withdraw (in the reconcile dialog)"
 msgstr "isplata (u dijalogu za usklađivanje)"
-
-#~ msgid "invoice owner"
-#~ msgstr "Kunde, Rechnungsempfänger"