gnucash unstable: Multiple changes pushed

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/580ce72d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fc5bdfa1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/51e25112 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/18f0d053 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/33508248 (commit)
	from  https://github.com/Gnucash/gnucash/commit/2d983c67 (commit)



commit 580ce72da73ea6ee914fba5e988f7fbf83644241
Merge: 3350824 fc5bdfa
Author: fell <frank.h.ellenberger at gmail.com>
Date:   Mon Mar 5 03:40:48 2018 +0100

    Merge branch 'maint' into unstable

diff --cc gnucash/gnome/reconcile-view.c
index 9e205eb,0000000..99829f9
mode 100644,000000..100644
--- a/gnucash/gnome/reconcile-view.c
+++ b/gnucash/gnome/reconcile-view.c
@@@ -1,995 -1,0 +1,996 @@@
 +/********************************************************************\
 + * reconcile-view.c -- A view of accounts to be reconciled for      *
 + *                     GnuCash.                                     *
 + * Copyright (C) 1998,1999 Jeremy Collins	                    *
 + * Copyright (C) 1998-2000 Linas Vepstas                            *
 + * Copyright (C) 2012 Robert Fewell                                 *
 + *                                                                  *
 + * This program is free software; you can redistribute it and/or    *
 + * modify it under the terms of the GNU General Public License as   *
 + * published by the Free Software Foundation; either version 2 of   *
 + * the License, or (at your option) any later version.              *
 + *                                                                  *
 + * This program is distributed in the hope that it will be useful,  *
 + * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
 + * GNU General Public License for more details.                     *
 + *                                                                  *
 + * You should have received a copy of the GNU General Public License*
 + * along with this program; if not, contact:                        *
 + *                                                                  *
 + * Free Software Foundation           Voice:  +1-617-542-5942       *
 + * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
 + * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
 +\********************************************************************/
 +
 +#include <config.h>
 +
 +#include <gtk/gtk.h>
 +#include <glib/gi18n.h>
 +#include <gdk/gdkkeysyms.h>
 +
 +#include "gnc-date.h"
 +#include "qof.h"
 +#include "qofbook.h"
 +#include "Transaction.h"
 +#include "gnc-ui-util.h"
 +#include "gnc-prefs.h"
 +#include "reconcile-view.h"
 +#include "search-param.h"
 +#include "gnc-component-manager.h"
 +
 +#define GNC_PREF_CHECK_CLEARED "check-cleared"
 +
 +/* Signal codes */
 +enum
 +{
 +    TOGGLE_RECONCILED,
 +    LINE_SELECTED,
 +    DOUBLE_CLICK_SPLIT,
 +    LAST_SIGNAL
 +};
 +
 +
 +/** Static Globals ****************************************************/
 +static GNCQueryViewClass *parent_class = NULL;
 +static guint reconcile_view_signals[LAST_SIGNAL] = {0};
 +
 +/** Static function declarations **************************************/
 +static void gnc_reconcile_view_init (GNCReconcileView *view);
 +static void gnc_reconcile_view_class_init (GNCReconcileViewClass *klass);
 +static void gnc_reconcile_view_finalize (GObject *object);
 +static gpointer gnc_reconcile_view_is_reconciled (gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_line_toggled (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_double_click_entry (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static void gnc_reconcile_view_row_selected (GNCQueryView *qview, gpointer item, gpointer user_data);
 +static gboolean gnc_reconcile_view_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data);
 +static gboolean gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y, gboolean keyboard_mode,
 +					 GtkTooltip* tooltip, gpointer* user_data);
 +
 +GType
 +gnc_reconcile_view_get_type (void)
 +{
 +    static GType gnc_reconcile_view_type = 0;
 +
 +    if (gnc_reconcile_view_type == 0)
 +    {
 +        static const GTypeInfo gnc_reconcile_view_info =
 +        {
 +            sizeof (GNCReconcileViewClass),
 +            NULL,
 +            NULL,
 +            (GClassInitFunc) gnc_reconcile_view_class_init,
 +            NULL,
 +            NULL,
 +            sizeof (GNCReconcileView),
 +            0,
 +            (GInstanceInitFunc) gnc_reconcile_view_init
 +        };
 +
 +        gnc_reconcile_view_type = g_type_register_static (GNC_TYPE_QUERY_VIEW,
 +                                  "GncReconcileView",
 +                                  &gnc_reconcile_view_info, 0);
 +    }
 +    return gnc_reconcile_view_type;
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_tooltip_cb (GNCQueryView *qview, gint x, gint y,
 +	gboolean keyboard_mode, GtkTooltip *tooltip, gpointer *user_data)
 +{
 +    GtkTreeModel* model;
 +    GtkTreeIter iter;
 +
 +    // If the Description is longer than can be display, show it in a tooltip
 +    if (gtk_tree_view_get_tooltip_context (GTK_TREE_VIEW (qview), &x, &y, keyboard_mode, &model, NULL, &iter))
 +    {
 +        GtkTreeViewColumn *col;
 +        GList *cols;
 +        gint col_pos, col_width;
 +	gchar* desc_text = NULL;
 +
 +        /* Are we in keyboard tooltip mode, displays tooltip below/above treeview CTRL+F1 */
 +        if (keyboard_mode == FALSE)
 +        {
 +            if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (qview), x, y, NULL, &col, NULL, NULL) == FALSE)
 +                return FALSE;
 +        }
 +        else
 +            gtk_tree_view_get_cursor (GTK_TREE_VIEW (qview), NULL, &col);
 +
 +        cols = gtk_tree_view_get_columns (GTK_TREE_VIEW (qview));
 +        col_width = gtk_tree_view_column_get_width (col);
 +        col_pos = g_list_index (cols, col);
 +        g_list_free (cols);
 +
 +        /* If column is not description, do not show tooltip */
 +        if (col_pos != 2)
 +            return FALSE;
 +
 +        gtk_tree_model_get (model, &iter, 3, &desc_text, -1);
 +
 +        if (desc_text)
 +        {
 +            PangoLayout* layout;
 +            gint text_width;
 +            gint root_x, root_y;
 +            gint cur_x, cur_y;
 +
 +            layout = gtk_widget_create_pango_layout (GTK_WIDGET (qview), desc_text);
 +            pango_layout_get_pixel_size (layout, &text_width, NULL);
 +            g_object_unref (layout);
 +
 +            /* If text_width + 10 <= column_width, do not show tooltip */
 +            if ((text_width + 10) <= col_width)
 +            {
 +                g_free (desc_text);
 +                return FALSE;
 +            }
 +
 +            if (keyboard_mode == FALSE)
 +            {
 +#if GTK_CHECK_VERSION(3,20,0)
 +                GdkSeat *seat;
 +#else
 +                GdkDeviceManager *device_manager;
 +#endif
 +                GdkDevice *pointer;
 +                GdkScreen *screen;
 +                GtkWindow *tip_win = NULL;
 +                GdkWindow *parent_window;
 +                GList *win_list, *node;
 +
 +                parent_window = gtk_widget_get_parent_window (GTK_WIDGET (qview));
 +
 +#if GTK_CHECK_VERSION(3,20,0)
 +                seat = gdk_display_get_default_seat (gdk_window_get_display (parent_window));
 +                pointer = gdk_seat_get_pointer (seat);
 +#else
 +                device_manager = gdk_display_get_device_manager (gdk_window_get_display (parent_window));
 +                pointer = gdk_device_manager_get_client_pointer (device_manager);
 +#endif
 +
 +                gdk_window_get_device_position (parent_window, pointer, &cur_x, &cur_y, NULL);
 +
 +                gdk_window_get_origin (parent_window, &root_x, &root_y);
 +
 +                screen = gtk_widget_get_screen (GTK_WIDGET (qview));
 +
 +                /* Get a list of toplevel windows */
 +                win_list = gtk_window_list_toplevels ();
 +
 +                /* Look for the gtk-tooltip window, we do this as gtk_widget_get_tooltip_window
 +                   does not seem to work for the default tooltip window, custom yes */
 +                for (node = win_list;  node != NULL;  node = node->next)
 +                {
 +                    if (g_strcmp0 (gtk_widget_get_name (node->data), "gtk-tooltip") == 0)
 +                    tip_win = node->data;
 +                }
 +                g_list_free (win_list);
 +
 +	        gtk_tooltip_set_text (tooltip, desc_text);
 +
 +                if (GTK_IS_WINDOW (tip_win))
 +                {
 +#if GTK_CHECK_VERSION(3,22,0)
 +                    GdkMonitor *mon;
 +#else
 +                    gint monitor_num;
 +#endif
 +                    GdkRectangle monitor;
 +                    GtkRequisition requisition;
 +                    gint x, y;
 +
 +                    gtk_widget_get_preferred_size (GTK_WIDGET (tip_win), &requisition, NULL);
 +
 +                    x = root_x + cur_x + 10;
 +                    y = root_y + cur_y + 10;
 +
 +#if GTK_CHECK_VERSION(3,22,0)
 +                    mon = gdk_display_get_monitor_at_point (gdk_display_get_default(), x, y);
 +                    gdk_monitor_get_geometry (mon, &monitor);
 +#else
 +                    monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
 +                    gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
 +#endif
 +
 +                    if (x + requisition.width > monitor.x + monitor.width)
 +                        x -= x - (monitor.x + monitor.width) + requisition.width;
 +                    else if (x < monitor.x)
 +                        x = monitor.x;
 +
 +                    if (y + requisition.height > monitor.y + monitor.height)
 +                        y -= y - (monitor.y + monitor.height) + requisition.height;
 +
 +                    gtk_window_move (tip_win, x, y);
 +                }
 +            }
 +	    gtk_tooltip_set_text (tooltip, desc_text);
 +            g_free (desc_text);
 +	    return TRUE;
 +        }
 +    }
 +    return FALSE;
 +}
 +
 +
 +/****************************************************************************\
 + * gnc_reconcile_view_new                                                   *
 + *   creates the account tree                                               *
 + *                                                                          *
 + * Args: account        - the account to use in filling up the splits.      *
 + *       type           - the type of view, RECLIST_DEBIT or RECLIST_CREDIT *
 + *       statement_date - date of statement                                 *
 + * Returns: the account tree widget, or NULL if there was a problem.        *
 +\****************************************************************************/
 +static void
 +gnc_reconcile_view_construct (GNCReconcileView *view, Query *query)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW (view);
 +    GtkTreeViewColumn *col;
 +    GtkTreeSelection  *selection;
 +    GList             *renderers;
 +    GtkCellRenderer   *cr0;
 +    gboolean           inv_sort = FALSE;
 +
 +    if (view->view_type == RECLIST_CREDIT)
 +        inv_sort = TRUE;
 +
 +    /* Construct the view */
 +    gnc_query_view_construct (qview, view->column_list, query);
 +    gnc_query_view_set_numerics (qview, TRUE, inv_sort);
 +
 +    /* Set the description field to have spare space */
 +    col = gtk_tree_view_get_column (GTK_TREE_VIEW (qview), 2);
 +    gtk_tree_view_column_set_expand (col, TRUE);
 +
 +    /* Get the renderer of the description column and set ellipsize value */
 +    renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (col));
 +    cr0 = g_list_nth_data (renderers, 0);
 +    g_list_free (renderers);
 +    g_object_set (cr0, "ellipsize", PANGO_ELLIPSIZE_END, NULL );
 +
 +    gtk_widget_set_has_tooltip (GTK_WIDGET (qview), TRUE);
 +
 +    /* Set the selection method */
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 +
 +    /* Now set up the signals for the QueryView */
 +    g_signal_connect (G_OBJECT (qview), "column_toggled",
 +                      G_CALLBACK (gnc_reconcile_view_line_toggled), view);
 +    g_signal_connect (G_OBJECT (qview), "double_click_entry",
 +                      G_CALLBACK (gnc_reconcile_view_double_click_entry), view);
 +    g_signal_connect (G_OBJECT (qview), "row_selected",
 +                      G_CALLBACK (gnc_reconcile_view_row_selected), view);
 +    g_signal_connect (G_OBJECT (qview), "key_press_event",
 +                      G_CALLBACK (gnc_reconcile_view_key_press_cb), view);
 +    g_signal_connect (G_OBJECT (qview), "query-tooltip",
 +                      G_CALLBACK (gnc_reconcile_view_tooltip_cb), view);
 +}
 +
 +
 +GtkWidget *
 +gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
 +                       time64 statement_date)
 +{
 +    GNCReconcileView *view;
 +    GtkListStore     *liststore;
 +    gboolean          include_children, auto_check;
 +    GList            *accounts = NULL;
 +    GList            *splits;
 +    Query            *query;
 +
 +    g_return_val_if_fail (account, NULL);
 +    g_return_val_if_fail ((type == RECLIST_DEBIT) ||
 +                         (type == RECLIST_CREDIT), NULL);
 +
 +    view = g_object_new (GNC_TYPE_RECONCILE_VIEW, NULL);
 +
 +    /* Create the list store with 6 columns and add to treeview,
 +       column 0 will be a pointer to the entry */
 +    liststore = gtk_list_store_new (6, G_TYPE_POINTER, G_TYPE_STRING, 
 +                G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN );
 +    gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (liststore));
 +    g_object_unref (liststore);
 +
 +    view->account = account;
 +    view->view_type = type;
 +    view->statement_date = statement_date;
 +
 +    query = qof_query_create_for (GNC_ID_SPLIT);
 +    qof_query_set_book (query, gnc_get_current_book ());
 +
 +    include_children = xaccAccountGetReconcileChildrenStatus (account);
 +    if (include_children)
 +        accounts = gnc_account_get_descendants (account);
 +
 +    /* match the account */
 +    accounts = g_list_prepend (accounts, account);
 +
 +    xaccQueryAddAccountMatch (query, accounts, QOF_GUID_MATCH_ANY, QOF_QUERY_AND);
 +
 +    g_list_free (accounts);
 +
 +    /* limit the matches to CREDITs and DEBITs only, depending on the type */
 +    if (type == RECLIST_CREDIT)
 +        xaccQueryAddValueMatch(query, gnc_numeric_zero (),
 +                               QOF_NUMERIC_MATCH_CREDIT,
 +                               QOF_COMPARE_GTE, QOF_QUERY_AND);
 +    else
 +        xaccQueryAddValueMatch(query, gnc_numeric_zero (),
 +                               QOF_NUMERIC_MATCH_DEBIT,
 +                               QOF_COMPARE_GTE, QOF_QUERY_AND);
 +
 +    /* limit the matches only to Cleared and Non-reconciled splits */
 +    xaccQueryAddClearedMatch (query, CLEARED_NO | CLEARED_CLEARED, QOF_QUERY_AND);
 +
 +    /* Initialize the QueryList */
 +    gnc_reconcile_view_construct (view, query);
 +
 +    /* find the list of splits to auto-reconcile */
 +    auto_check = gnc_prefs_get_bool (GNC_PREFS_GROUP_RECONCILE, GNC_PREF_CHECK_CLEARED);
 +
 +    if (auto_check)
 +    {
++        time64 statement_date_day_end = gnc_time64_get_day_end(statement_date);
 +        for (splits = qof_query_run (query); splits; splits = splits->next)
 +        {
 +            Split *split = splits->data;
 +            char recn = xaccSplitGetReconcile (split);
 +            time64 trans_date = xaccTransGetDate (xaccSplitGetParent (split));
 +
 +            /* Just an extra verification that our query is correct ;) */
 +            g_assert (recn == NREC || recn == CREC);
 +
 +            if (recn == CREC &&
- 		gnc_difftime (trans_date, statement_date) <= 0)
++		gnc_difftime (trans_date, statement_date_day_end) <= 0)
 +		g_hash_table_insert (view->reconciled, split, split);
 +        }
 +    }
 +
 +    /* Free the query -- we don't need it anymore */
 +    qof_query_destroy (query);
 +
 +    return GTK_WIDGET (view);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_init (GNCReconcileView *view)
 +{
 +    GNCSearchParamSimple *param;
 +    GList          *columns = NULL;
 +    gboolean num_action =
 +                qof_book_use_split_action_for_num_field(gnc_get_current_book());
 +
 +    view->reconciled = g_hash_table_new (NULL, NULL);
 +    view->account = NULL;
 +    view->sibling = NULL;
 +
 +    param = gnc_search_param_simple_new();
 +    gnc_search_param_set_param_fcn (param, QOF_TYPE_BOOLEAN,
 +                                    gnc_reconcile_view_is_reconciled, view);
 +    gnc_search_param_set_title ((GNCSearchParam *) param, _("Reconciled:R") + 11);
 +    gnc_search_param_set_justify ((GNCSearchParam *) param, GTK_JUSTIFY_CENTER);
 +    gnc_search_param_set_passive ((GNCSearchParam *) param, TRUE);
 +    gnc_search_param_set_non_resizeable ((GNCSearchParam *) param, TRUE);
 +    columns = g_list_prepend (columns, param);
 +    columns = gnc_search_param_prepend_with_justify (columns, _("Amount"),
 +              GTK_JUSTIFY_RIGHT,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_AMOUNT, NULL);
 +    columns = gnc_search_param_prepend (columns, _("Description"), NULL,
 +                                        GNC_ID_SPLIT, SPLIT_TRANS,
 +                                        TRANS_DESCRIPTION, NULL);
 +    columns = num_action ?
 +              gnc_search_param_prepend_with_justify (columns, _("Num"),
 +              GTK_JUSTIFY_CENTER,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_ACTION, NULL) :
 +              gnc_search_param_prepend_with_justify (columns, _("Num"),
 +              GTK_JUSTIFY_CENTER,
 +              NULL, GNC_ID_SPLIT,
 +              SPLIT_TRANS, TRANS_NUM, NULL);
 +    columns = gnc_search_param_prepend (columns, _("Date"), NULL, GNC_ID_SPLIT,
 +                                        SPLIT_TRANS, TRANS_DATE_POSTED, NULL);
 +
 +    view->column_list = columns;
 +}
 +
 +
 +static void
 +gnc_reconcile_view_class_init (GNCReconcileViewClass *klass)
 +{
 +    GObjectClass    *object_class;
 +
 +    object_class =  G_OBJECT_CLASS (klass);
 +
 +    parent_class = g_type_class_peek_parent (klass);
 +
 +    reconcile_view_signals[TOGGLE_RECONCILED] =
 +        g_signal_new("toggle_reconciled",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      toggle_reconciled),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    reconcile_view_signals[LINE_SELECTED] =
 +        g_signal_new("line_selected",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      line_selected),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    reconcile_view_signals[DOUBLE_CLICK_SPLIT] =
 +        g_signal_new("double_click_split",
 +                     G_OBJECT_CLASS_TYPE (object_class),
 +                     G_SIGNAL_RUN_FIRST,
 +                     G_STRUCT_OFFSET (GNCReconcileViewClass,
 +                                      double_click_split),
 +                     NULL, NULL,
 +                     g_cclosure_marshal_VOID__POINTER,
 +                     G_TYPE_NONE, 1,
 +                     G_TYPE_POINTER);
 +
 +    object_class->finalize = gnc_reconcile_view_finalize;
 +
 +    klass->toggle_reconciled = NULL;
 +    klass->line_selected = NULL;
 +    klass->double_click_split = NULL;
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle_split (GNCReconcileView *view, Split *split)
 +{
 +    Split *current;
 +
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +    g_return_if_fail (view->reconciled != NULL);
 +
 +    current = g_hash_table_lookup (view->reconciled, split);
 +
 +    if (current == NULL)
 +        g_hash_table_insert (view->reconciled, split, split);
 +    else
 +        g_hash_table_remove (view->reconciled, split);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle_children (Account *account, GNCReconcileView *view, Split *split)
 +{
 +    GList       *child_accounts, *node;
 +    Transaction *transaction;
 +
 +    /*
 +     * Need to get all splits in this transaction and identify any that are
 +     * in the same hierarchy as the account being reconciled (not necessarily
 +     * the account this split is from.)
 +     *
 +     * For each of these splits toggle them all to the same state.
 +     */
 +    child_accounts = gnc_account_get_descendants (account);
 +    child_accounts = g_list_prepend (child_accounts, account);
 +    transaction = xaccSplitGetParent (split);
 +    for (node = xaccTransGetSplitList (transaction); node; node = node->next)
 +    {
 +        Split *other_split;
 +        Account *other_account;
 +        GNCReconcileView *current_view;
 +
 +        GtkTreeModel *model;
 +        GtkTreeIter   iter;
 +        gboolean      valid;
 +        gpointer      pointer;
 +
 +        other_split = node->data;
 +        other_account = xaccSplitGetAccount (other_split);
 +        if (other_split == split)
 +            continue;
 +        /* Check this 'other' account in in the same hierarchy */
 +        if (!g_list_find (child_accounts, other_account))
 +            continue;
 +        /* Search our sibling view for this split first.  We search the
 +         * sibling list first because that it where it is most likely to be.
 +         */
 +        current_view = view->sibling;
 +        if (!gnc_query_view_item_in_view (GNC_QUERY_VIEW (current_view), other_split))
 +        {
 +            /* Not in the sibling view, try this view */
 +            current_view = view;
 +            if (!gnc_query_view_item_in_view (GNC_QUERY_VIEW (current_view), other_split))
 +                /* We can't find it, nothing more I can do about it */
 +                continue;
 +        }
 +
 +        /* Found the other split. Toggle the reconciled check mark in the view... */
 +        model = gtk_tree_view_get_model (GTK_TREE_VIEW (current_view));
 +        valid = gtk_tree_model_get_iter_first (model, &iter);
 +
 +        while (valid)
 +        {
 +            // Walk through the list, reading each row
 +            gtk_tree_model_get (model, &iter, 0, &pointer, -1);
 +
 +            if(pointer == other_split)
 +            {
 +                gboolean toggled;
 +                gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +                gtk_list_store_set (GTK_LIST_STORE (model), &iter, 5, !toggled, -1);
 +                break;
 +            }
 +
 +            valid = gtk_tree_model_iter_next (model, &iter);
 +        }
 +
 +        /* ...and toggle its reconciled state in the internal hash */
 +        gnc_reconcile_view_toggle_split (current_view, other_split);
 +    }
 +    g_list_free (child_accounts);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_toggle (GNCReconcileView *view, Split *split)
 +{
 +    gboolean include_children;
 +
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +    g_return_if_fail (view->reconciled != NULL);
 +
 +    gnc_reconcile_view_toggle_split (view, split);
 +
 +    include_children = xaccAccountGetReconcileChildrenStatus (view->account);
 +    if (include_children)
 +        gnc_reconcile_view_toggle_children (view->account, view, split);
 +
 +    g_signal_emit (G_OBJECT (view),
 +                   reconcile_view_signals[TOGGLE_RECONCILED], 0, split);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_line_toggled (GNCQueryView *qview,
 +                                 gpointer item,
 +                                 gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    GtkTreeModel     *model;
 +    GtkTreeIter       iter;
 +    gpointer          entry;
 +
 +    g_return_if_fail (user_data);
 +    g_return_if_fail (GNC_IS_QUERY_VIEW (qview));
 +
 +    view = user_data;
 +
 +    model = gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    gtk_tree_model_iter_nth_child (model, &iter, NULL, qview->toggled_row);
 +    gtk_list_store_set (GTK_LIST_STORE (model), &iter, qview->toggled_column, GPOINTER_TO_INT(item), -1);
 +    gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +
 +    gnc_reconcile_view_toggle (view, entry);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_double_click_entry (GNCQueryView *qview,
 +                                       gpointer item,
 +                                       gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    /* item is the entry */
 +    g_return_if_fail (user_data);
 +    g_return_if_fail (GNC_IS_QUERY_VIEW (qview));
 +
 +    view = user_data;
 +
 +    g_signal_emit(G_OBJECT (view),
 +                  reconcile_view_signals[DOUBLE_CLICK_SPLIT], 0, item);
 +}
 +
 +
 +static void
 +gnc_reconcile_view_row_selected (GNCQueryView *qview,
 +                                 gpointer item,
 +                                 gpointer user_data)
 +{
 +    GNCReconcileView *view;
 +    /* item is the number of selected entries */
 +    g_return_if_fail(user_data);
 +    g_return_if_fail(GNC_IS_QUERY_VIEW(qview));
 +
 +    view = user_data;
 +
 +    g_signal_emit(G_OBJECT(view),
 +                  reconcile_view_signals[LINE_SELECTED], 0, item);
 +}
 +
 +
 +void
 +gnc_reconcile_view_set_list ( GNCReconcileView  *view, gboolean reconcile)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +    GtkTreeModel      *model;
 +    gpointer           entry;
 +    gboolean           toggled;
 +    GList             *node;
 +    GList             *list_of_rows;
 +
 +    model =  gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    list_of_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 +
 +    /* We get a list of TreePaths */
 +    for(node = list_of_rows; node; node = node->next)
 +    {
 +        GtkTreeIter iter;
 +        if(gtk_tree_model_get_iter(model, &iter, node->data))
 +        {
 +            /* now iter is a valid row iterator */
 +            gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +            gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +
 +            gtk_list_store_set (GTK_LIST_STORE (model), &iter, 5, reconcile, -1);
 +
 +            if(reconcile != toggled)
 +                gnc_reconcile_view_toggle (view, entry);
 +        }
 +        gtk_tree_path_free(node->data);
 +    }
 +    g_list_free(list_of_rows);
 +}
 +
 +
 +gint 
 +gnc_reconcile_view_num_selected (GNCReconcileView  *view )
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    return gtk_tree_selection_count_selected_rows (selection);
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_set_toggle (GNCReconcileView  *view)
 +{
 +    GNCQueryView      *qview = GNC_QUERY_VIEW(view);
 +    GtkTreeSelection  *selection;
 +    GtkTreeModel      *model;
 +    gboolean           toggled;
 +    GList             *node;
 +    GList             *list_of_rows;
 +    gint               num_toggled = 0;
 +    gint               num_selected = 0;
 +
 +    model =  gtk_tree_view_get_model (GTK_TREE_VIEW (qview));
 +    selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (qview));
 +    list_of_rows = gtk_tree_selection_get_selected_rows (selection, &model);
 +    num_selected = gtk_tree_selection_count_selected_rows (selection);
 +
 +    /* We get a list of TreePaths */
 +    for(node = list_of_rows; node; node = node->next)
 +    {
 +        GtkTreeIter iter;
 +        toggled = FALSE;
 +        if(gtk_tree_model_get_iter(model, &iter, node->data))
 +        {
 +            /* now iter is a valid row iterator */
 +            gtk_tree_model_get (model, &iter, 5, &toggled, -1);
 +
 +            if(toggled)
 +                num_toggled++;
 +        }
 +        gtk_tree_path_free(node->data);
 +    }
 +    g_list_free(list_of_rows);
 +
 +    if(num_toggled == num_selected)
 +        return FALSE;
 +    else
 +        return TRUE;
 +}
 +
 +
 +static gboolean
 +gnc_reconcile_view_key_press_cb (GtkWidget *widget, GdkEventKey *event,
 +                            gpointer user_data)
 +{
 +    GNCReconcileView  *view = GNC_RECONCILE_VIEW(user_data);
 +    gboolean           toggle;
 +
 +    switch (event->keyval)
 +    {
 +    case GDK_KEY_space:
 +        g_signal_stop_emission_by_name (widget, "key_press_event");
 +
 +        toggle = gnc_reconcile_view_set_toggle (view);
 +        gnc_reconcile_view_set_list (view, toggle);
 +        return TRUE;
 +        break;
 +
 +    default:
 +        return FALSE;
 +    }
 +}
 +
 +
 +static void
 +gnc_reconcile_view_finalize (GObject *object)
 +{
 +    GNCReconcileView *view = GNC_RECONCILE_VIEW (object);
 +
 +    if (view->reconciled != NULL)
 +    {
 +        g_hash_table_destroy (view->reconciled);
 +        view->reconciled = NULL;
 +    }
 +    G_OBJECT_CLASS (parent_class)->finalize (object);
 +}
 +
 +
 +gint
 +gnc_reconcile_view_get_num_splits (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, 0);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), 0);
 +
 +    return gnc_query_view_get_num_entries (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +Split *
 +gnc_reconcile_view_get_current_split (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, NULL);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), NULL);
 +
 +    return gnc_query_view_get_selected_entry (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_is_reconciled                                 *
 + *   Is the item a reconciled split?                                *
 + *                                                                  *
 + * Args: item      - the split to be checked                        *
 + *       user_data - a pointer to the GNCReconcileView              *
 + * Returns: whether the split is to be reconciled.                  *
 +\********************************************************************/
 +static gpointer
 +gnc_reconcile_view_is_reconciled (gpointer item, gpointer user_data)
 +{
 +    GNCReconcileView *view = user_data;
 +    Split *current;
 +
 +    g_return_val_if_fail (item, NULL);
 +    g_return_val_if_fail (view, NULL);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), NULL);
 +
 +    if (!view->reconciled)
 +        return NULL;
 +
 +    current = g_hash_table_lookup (view->reconciled, item);
 +    return GINT_TO_POINTER (current != NULL);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_refresh                                       *
 + *   refreshes the view                                             *
 + *                                                                  *
 + * Args: view - view to refresh                                     *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +static void
 +grv_refresh_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    GNCReconcileView *view = user_data;
 +    GNCQueryView *qview = GNC_QUERY_VIEW (view);
 +
 +    if (!gnc_query_view_item_in_view (qview, key))
 +        g_hash_table_remove (view->reconciled, key);
 +}
 +
 +void
 +gnc_reconcile_view_refresh (GNCReconcileView *view)
 +{
 +    GNCQueryView *qview;
 +
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    qview = GNC_QUERY_VIEW (view);
 +    gnc_query_view_refresh (qview);
 +
 +    /* Now verify that everything in the reconcile hash is still in qview */
 +    if (view->reconciled)
 +        g_hash_table_foreach (view->reconciled, grv_refresh_helper, view);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_reconciled_balance                            *
 + *   returns the reconciled balance of the view                     *
 + *                                                                  *
 + * Args: view - view to get reconciled balance of                   *
 + * Returns: reconciled balance (gnc_numeric)                        *
 +\********************************************************************/
 +static void
 +grv_balance_hash_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    Split *split = key;
 +    gnc_numeric *total = user_data;
 +
 +    *total = gnc_numeric_add_fixed (*total, xaccSplitGetAmount (split));
 +}
 +
 +gnc_numeric
 +gnc_reconcile_view_reconciled_balance (GNCReconcileView *view)
 +{
 +    gnc_numeric total = gnc_numeric_zero ();
 +
 +    g_return_val_if_fail (view != NULL, total);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), total);
 +
 +    if (view->reconciled == NULL)
 +        return total;
 +
 +    g_hash_table_foreach (view->reconciled, grv_balance_hash_helper, &total);
 +
 +    return gnc_numeric_abs (total);
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_commit                                        *
 + *   Commit the reconcile information in the view. Only change the  *
 + *   state of those items marked as reconciled.  All others should  *
 + *   retain their previous state (none, cleared, voided, etc.).     *
 + *                                                                  *
 + * Args: view - view to commit                                      *
 + *       date - date to set as the reconcile date                   *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +static void
 +grv_commit_hash_helper (gpointer key, gpointer value, gpointer user_data)
 +{
 +    Split *split = key;
 +    time64 *date = user_data;
 +
 +    xaccSplitSetReconcile (split, YREC);
 +    xaccSplitSetDateReconciledSecs (split, *date);
 +}
 +
 +void
 +gnc_reconcile_view_commit (GNCReconcileView *view, time64 date)
 +{
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    if (view->reconciled == NULL)
 +        return;
 +
 +    gnc_suspend_gui_refresh();
 +    g_hash_table_foreach (view->reconciled, grv_commit_hash_helper, &date);
 +    gnc_resume_gui_refresh();
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_postpone                                      *
 + *   postpone the reconcile information in the view by setting      *
 + *   reconciled splits to cleared status                            *
 + *                                                                  *
 + * Args: view - view to commit                                      *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +void
 +gnc_reconcile_view_postpone (GNCReconcileView *view)
 +{
 +    GtkTreeModel *model;
 +    GtkTreeIter   iter;
 +    int           num_splits;
 +    int           i;
 +    gpointer      entry = NULL;
 +
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    if (view->reconciled == NULL)
 +        return;
 +
 +    model = gtk_tree_view_get_model (GTK_TREE_VIEW (GNC_QUERY_VIEW (view)));
 +    gtk_tree_model_get_iter_first (model, &iter);
 +
 +    num_splits = gnc_query_view_get_num_entries (GNC_QUERY_VIEW (view));
 +
 +    gnc_suspend_gui_refresh();
 +    for (i = 0; i < num_splits; i++)
 +    {
 +        char recn;
 +
 +        gtk_tree_model_get (model, &iter, 0, &entry, -1);
 +
 +        // Don't change splits past reconciliation date that haven't been
 +        // set to be reconciled
 +        if (gnc_difftime (view->statement_date,
 +			  xaccTransGetDate (xaccSplitGetParent (entry))) >= 0 ||
 +                g_hash_table_lookup (view->reconciled, entry))
 +        {
 +            recn = g_hash_table_lookup (view->reconciled, entry) ? CREC : NREC;
 +            xaccSplitSetReconcile (entry, recn);
 +        }
 +        gtk_tree_model_iter_next (model, &iter);
 +    }
 +    gnc_resume_gui_refresh();
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_unselect_all                                  *
 + *   unselect all splits in the view                                *
 + *                                                                  *
 + * Args: view - view to unselect all                                *
 + * Returns: nothing                                                 *
 +\********************************************************************/
 +void
 +gnc_reconcile_view_unselect_all(GNCReconcileView *view)
 +{
 +    g_return_if_fail (view != NULL);
 +    g_return_if_fail (GNC_IS_RECONCILE_VIEW (view));
 +
 +    gnc_query_view_unselect_all (GNC_QUERY_VIEW (view));
 +}
 +
 +
 +/********************************************************************\
 + * gnc_reconcile_view_changed                                       *
 + *   returns true if any splits have been reconciled                *
 + *                                                                  *
 + * Args: view - view to get changed status for                      *
 + * Returns: true if any reconciled splits                           *
 +\********************************************************************/
 +gboolean
 +gnc_reconcile_view_changed (GNCReconcileView *view)
 +{
 +    g_return_val_if_fail (view != NULL, FALSE);
 +    g_return_val_if_fail (GNC_IS_RECONCILE_VIEW (view), FALSE);
 +
 +    return g_hash_table_size (view->reconciled) != 0;
 +}
 +

commit fc5bdfa10b9aa38ca37ed841cfed697149d75f4c
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sat Mar 3 22:08:39 2018 +0100

    Revision and expansion of accounts for the Russian language.
    In addition, replacing of commodity: USD => RUB.
    
    Cherrypicked from unstable and adjusted to main

diff --git a/accounts/ru/CMakeLists.txt b/accounts/ru/CMakeLists.txt
index a2a87d1..e8d4128 100644
--- a/accounts/ru/CMakeLists.txt
+++ b/accounts/ru/CMakeLists.txt
@@ -1,7 +1,11 @@
 SET(account_DATA
+  acctchrt_auto.gnucash-xea
+  acctchrt_autoloan.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_homeloan.gnucash-xea
   acctchrt_homeown.gnucash-xea
+  acctchrt_kids.gnucash-xea
+  acctchrt_otherloan.gnucash-xea
   acctchrt_renter.gnucash-xea)
 
 SET_DIST_LIST(RU_DIST ${account_DATA} Makefile.am CMakeLists.txt)
diff --git a/accounts/ru/Makefile.am b/accounts/ru/Makefile.am
index 0aee455..6d9326c 100644
--- a/accounts/ru/Makefile.am
+++ b/accounts/ru/Makefile.am
@@ -2,9 +2,13 @@
 accountdir = ${GNC_ACCOUNTS_DIR}/ru
 
 account_DATA = \
+  acctchrt_auto.gnucash-xea \
+  acctchrt_autoloan.gnucash-xea \
   acctchrt_common.gnucash-xea \
   acctchrt_homeloan.gnucash-xea \
   acctchrt_homeown.gnucash-xea \
+  acctchrt_kids.gnucash-xea \
+  acctchrt_otherloan.gnucash-xea \
   acctchrt_renter.gnucash-xea
 
 EXTRA_DIST = \
diff --git a/accounts/ru/acctchrt_auto.gnucash-xea b/accounts/ru/acctchrt_auto.gnucash-xea
new file mode 100644
index 0000000..c679221
--- /dev/null
+++ b/accounts/ru/acctchrt_auto.gnucash-xea
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Автомобиль
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на автомобиль
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с автомобилем.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Головной счет</act:name>
+  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+  <act:type>ROOT</act:type>
+  <act:commodity-scu>0</act:commodity-scu>
+</gnc:account> 
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспорт</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автомобиль</act:name>
+  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы на автомобиль</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Сборы</act:name>
+  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Сборы</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Топливо</act:name>
+  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Топливо</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Парковка</act:name>
+  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Парковка</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Ремонт и обслуживание</act:name>
+  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Ремонт и обслуживание</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Гараж</act:name>
+  <act:id type="new">5630f036a6b1aa8f37d4fdc51e7632a2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Гараж</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспортный налог</act:name>
+  <act:id type="new">6b242114ac2c3a1bda48df1f6b4db3fe</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспортный налог</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автостраховка</act:name>
+  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Страхование автотранспорта</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_autoloan.gnucash-xea
similarity index 68%
copy from accounts/ru/acctchrt_homeloan.gnucash-xea
copy to accounts/ru/acctchrt_autoloan.gnucash-xea
index 1d0b11b..e42eeb7 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на автомобиль
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на автомобиль
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на автомобиль.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
-  <act:name>Root Account</act:name>
+  <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,32 +51,32 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Автокредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Проценты</act:name>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на автомобиль</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_common.gnucash-xea b/accounts/ru/acctchrt_common.gnucash-xea
index c304444..37715e6 100644
--- a/accounts/ru/acctchrt_common.gnucash-xea
+++ b/accounts/ru/acctchrt_common.gnucash-xea
@@ -7,9 +7,10 @@
       Базовый набор наиболее используемых счетов
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Большинство пользователей предпочитает этот набор счетов. Он включает наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
-  </gnc-act:long-description>    
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+      Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
+    </gnc-act:long-description>
+    <gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -22,7 +23,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Активы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -39,7 +40,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Текущие активы</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
@@ -56,7 +57,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековый счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -67,7 +68,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитный счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -78,18 +79,18 @@
   <act:type>CASH</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Наличные</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Долги</act:name>
+  <act:name>Обязательства</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Долги</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -106,7 +107,7 @@
   <act:type>CREDIT</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Кредитная карта</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
@@ -117,7 +118,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Доходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -129,15 +130,37 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
+  <act:name>Работа</act:name>
+  <act:id type="new">558d76b1e4eb0ede3dd364ed705e9617</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Премия</act:description>
+  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Заработная плата</act:name>
+  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Заработная плата</act:description>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
   <act:name>Премия</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Премия</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Полученные подарки</act:name>
@@ -145,7 +168,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Полученные подарки</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -156,7 +179,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Процентный доход</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -167,7 +190,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековые проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -178,7 +201,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы с процентов</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -189,7 +212,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитные проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -200,29 +223,18 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Заработная плата</act:name>
-  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
-  <act:type>INCOME</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Заработная плата</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -234,158 +246,165 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Корректировка</act:name>
-  <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Корректировка</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Автомобиль</act:name>
-  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:name>Образование</act:name>
+  <act:id type="new">8b686c37652f2a3222642bfa27d34f83</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Расходы на автомобиль</act:description>
+  <act:description>Образование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Сборы</act:name>
-  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:name>Книги</act:name>
+  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Сборы</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Книги</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Топливо</act:name>
-  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:name>Учёба</act:name>
+  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Топливо</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Учёба</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Парковка</act:name>
-  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:name>Подписки</act:name>
+  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Парковка</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Подписки</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт и обслуживание</act:name>
-  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:name>Связь и телевидение</act:name>
+  <act:id type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ремонт и обслуживание</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Связь и телевидение</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Банковское обслуживание</act:name>
-  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
+  <act:name>Кабельное телевидение</act:name>
+  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Банковское обслуживание</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Кабельное телевидение</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Книги</act:name>
-  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
+  <act:name>Телефон</act:name>
+  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Книги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Телефон</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Кабельное телевидение</act:name>
-  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
+  <act:name>Интернет услуги</act:name>
+  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Кабельное телевидение</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Интернет услуги</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Благотворительность</act:name>
-  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
+  <act:name>Одежда</act:name>
+  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Благотворительность</act:description>
+  <act:description>Одежда</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Одежда</act:name>
-  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
+  <act:name>Техника</act:name>
+  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Одежда</act:description>
+  <act:description>Техника</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Компьютер</act:name>
-  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
+  <act:name>Пропитание</act:name>
+  <act:id type="new">2ad4ce1b4f373af407b8a6c81075334e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Компьютер</act:description>
+  <act:description>Пропитание</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Обеды</act:name>
+  <act:name>Столовая</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Обеды</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Столовая</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Учёба</act:name>
-  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
+  <act:name>Продукты</act:name>
+  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Учёба</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Продукты</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Развлечения</act:name>
@@ -393,7 +412,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Развлечения</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -404,7 +423,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Музыка и кино</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -415,7 +434,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Отдых</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -426,42 +445,42 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Путешествия</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подарки</act:name>
-  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
+  <act:name>Спорт</act:name>
+  <act:id type="new">d5b698225b04b3f8d8fdb387033e3329</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подарки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Спорт</act:description>
+  <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хозтовары</act:name>
-  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
+  <act:name>Подарки</act:name>
+  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хозтовары</act:description>
+  <act:description>Подарки</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хобби</act:name>
-  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
+  <act:name>Хозтовары</act:name>
+  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хобби</act:description>
+  <act:description>Хозтовары</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -470,54 +489,54 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Автостраховка</act:name>
-  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:name>Медицинское страхование</act:name>
+  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Автостраховка</act:description>
+  <act:description>Медицинское страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Медстраховка</act:name>
-  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
+  <act:name>Пенсионное страхование</act:name>
+  <act:id type="new">491e31dcfa7d1193b9c385bff97512e1</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Медстраховка</act:description>
+  <act:description>Пенсионное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование жизни</act:name>
-  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
+  <act:name>Социальное страхование</act:name>
+  <act:id type="new">2e9dc34fd27bbf937b7d89c6db859dba</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование жизни</act:description>
+  <act:description>Социальное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Химчистка/прачечная</act:name>
-  <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
+  <act:name>Страхование жизни</act:name>
+  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Химчистка/прачечная</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Страхование жизни</act:description>
+  <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Медицинские расходы</act:name>
@@ -525,7 +544,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Медицинские расходы</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -536,131 +555,155 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Разное</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Интернет услуги</act:name>
-  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
+  <act:name>Хобби</act:name>
+  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Интернет услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Хобби</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Телефон</act:name>
-  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
+  <act:name>Разное</act:name>
+  <act:id type="new">12f44aff5aeb8aba7be4d3b033aaa1d4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Телефон</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Разное</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественный транспорт</act:name>
-  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
+  <act:name>Благотворительность</act:name>
+  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественный транспорт</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Благотворительность</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подписки</act:name>
-  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
+  <act:name>Банковское обслуживание</act:name>
+  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подписки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Банковское обслуживание</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Питание</act:name>
-  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Питание</act:description>
+  <act:description>Транспорт</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Налоги</act:name>
-  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
+  <act:name>Общественный транспорт</act:name>
+  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Налоги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Общественный транспорт</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Федеральные</act:name>
-  <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
+  <act:name>Налоги</act:name>
+  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Федеральные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Налоги</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
-<!-- <gnc:account version="2.0.0">
-  <act:name>Medicare</act:name>
-  <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
+<gnc:account version="2.0.0">
+  <act:name>Другие налоги</act:name>
+  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Medicare</act:description>
+  <act:description>Другие налоги</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
-</gnc:account> -->
+</gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Другие налоги</act:name>
-  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
+  <act:name>Подоходный налог</act:name>
+  <act:id type="new">910d257186603830d831bfdaf03a4e0b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Другие налоги</act:description>
+  <act:description>Подоходный налог</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественная безопасность</act:name>
-  <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественная безопасность</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Проживание</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Региональные</act:name>
-  <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
+  <act:name>Ремонт</act:name>
+  <act:id type="new">89d7a0008e9ee88095385186302b1f7b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Региональные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Ремонт</act:description>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Коммунальные услуги</act:name>
@@ -668,10 +711,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Коммунальные услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Электричество</act:name>
@@ -679,7 +722,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Электричество</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -690,7 +733,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вывоз мусора</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -701,7 +744,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Газ</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -712,27 +755,21 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вода</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Собственные средства</act:name>
-  <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
-  <act:type>EQUITY</act:type>
+  <act:name>Другие сборы</act:name>
+  <act:id type="new">a8577e227433f26572033068bc7777f5</act:id>
+  <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Собственные средства</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
-  <act:slots>
-    <slot>
-      <slot:key>placeholder</slot:key>
-      <slot:value type="string">true</slot:value>
-    </slot>
-  </act:slots>
+  <act:description>Другие сборы</act:description>
+  <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Начальное сальдо</act:name>
@@ -740,11 +777,12 @@
   <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Остаток средств на начало периода</act:description>
-  <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_homeloan.gnucash-xea
index 1d0b11b..d8e26a5 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на недвижимость
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на недвижимость
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на недвижимость.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Ипотечный кредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на ипотеку</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_homeown.gnucash-xea b/accounts/ru/acctchrt_homeown.gnucash-xea
index 99c0bf5..362dc4b 100644
--- a/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
+    <gnc-account-example>
     <gnc-act:title>
-      Расходы домовладельца
+      Дом/Квартира
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с домовладением
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Вы можете выбрать этот набор счетов если являетесь домовладельцем. Этот набор предоставляет группу счетов, позволяющую управлять такими расходами, как страховка, налоги и ремонт.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -17,11 +18,11 @@
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,36 +34,25 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт дома</act:name>
-  <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Ремонт дома</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Страхование</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страховка дома</act:name>
+  <act:name>Страхование имущества</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страховка дома</act:description>
+  <act:description>Страхование имущества</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -71,10 +61,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налоги</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Налог на имущество</act:name>
@@ -82,11 +72,23 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налог на имущество</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Земельный налог</act:name>
+  <act:id type="new">6c5c05753e3a6b5eaeb63045ed218374</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Земельный налог</act:description>
+  <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
+</gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_kids.gnucash-xea b/accounts/ru/acctchrt_kids.gnucash-xea
new file mode 100644
index 0000000..21b6841
--- /dev/null
+++ b/accounts/ru/acctchrt_kids.gnucash-xea
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Дети
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на детей
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с детьми.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Root Account</act:name>
+  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+  <act:type>ROOT</act:type>
+  <act:commodity-scu>0</act:commodity-scu>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Доходы</act:name>
+  <act:id type="new">724c2a1128e49b0b28304d372b19f5a1</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Доходы</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Помощь</act:name>
+  <act:id type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Материальная помощь</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">724c2a1128e49b0b28304d372b19f5a1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Пособие на ребёнка</act:name>
+  <act:id type="new">ff445bf61420de7b5df2637060837151</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Пособие на ребёнка</act:description>
+  <act:parent type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">bc39f4d37eb75353f4f971e80b9d2818</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Дети</act:name>
+  <act:id type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Дети</act:description>
+  <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Школа</act:name>
+  <act:id type="new">88533a6a943b55551c3fff6043406a67</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Школа</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Детский сад</act:name>
+  <act:id type="new">5208f9c1e3d68a73ce0a6eda91ba5c61</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Детский сад</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/accounts/ru/acctchrt_homeloan.gnucash-xea b/accounts/ru/acctchrt_otherloan.gnucash-xea
similarity index 69%
copy from accounts/ru/acctchrt_homeloan.gnucash-xea
copy to accounts/ru/acctchrt_otherloan.gnucash-xea
index 1d0b11b..13d58c6 100644
--- a/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Другие кредиты
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Различные кредиты и связанные с ними платежи
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для различных кредитов и связанных с ними платежей.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Кредит (потребительский)</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за другие кредиты</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/accounts/ru/acctchrt_renter.gnucash-xea b/accounts/ru/acctchrt_renter.gnucash-xea
index d1b1d2d..061bbc7 100644
--- a/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/accounts/ru/acctchrt_renter.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Арендные расходы
+      Аренда
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с арендой недвижимости
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если арендуете дом, квартиру или другую недвижимость.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с арендой дома или квартиры.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,26 +34,21 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование</act:name>
-  <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование</act:description>
+  <act:description>Проживание</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Страховка аренды</act:name>
-  <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Страховка аренды</act:description>
-  <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Арендная плата</act:name>
@@ -60,11 +56,12 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Арендная плата</act:description>
-  <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->

commit 51e2511223eb0873f342f0153929ef53d849d0eb
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Mar 4 19:16:39 2018 +0800

    Bug 765846 - Expense Over Time for subaccounts: An error occurred while running the report
    
    fix crash if acc-depth too low

diff --git a/src/report/standard-reports/category-barchart.scm b/src/report/standard-reports/category-barchart.scm
index 45f7f92..c6396f4 100644
--- a/src/report/standard-reports/category-barchart.scm
+++ b/src/report/standard-reports/category-barchart.scm
@@ -264,15 +264,25 @@ developing over time"))
     (define (show-acct? a)
       (member a accounts))
 
+    (define tree-depth (if (equal? account-levels 'all)
+                           (gnc:get-current-account-tree-depth)
+                           account-levels))
+
+    (define the-acount-destination-alist
+      (account-destination-alist accounts account-types tree-depth))
+
     ;;(gnc:debug accounts)
     (if (not (null? accounts))
-        
+
+        (if (null? the-acount-destination-alist)
+            (gnc:html-document-add-object!
+             document
+             (gnc:html-make-empty-data-warning
+              report-title (gnc:report-id report-obj)))
+
         ;; Define more helper variables.
         (let* ((commodity-list #f)
                (exchange-fn #f)
-               (tree-depth (if (equal? account-levels 'all)
-                               (gnc:get-current-account-tree-depth)
-                               account-levels))
                (averaging-fraction-func (gnc:date-get-fraction-func averaging-selection))
                (interval-fraction-func (gnc:date-get-fraction-func interval))
                (averaging-multiplier
@@ -368,10 +378,7 @@ developing over time"))
 	  (define (apply-sign account x)
 	    (if (reverse-balance? account) (- x) x))
           (define (calculate-report accounts progress-range)
-	    (let* ((the-acount-destination-alist (account-destination-alist accounts
-									    account-types
-									    tree-depth))
-		   (account-reformat
+	    (let* ((account-reformat
 		    (if do-intervals?
 			(lambda (account result)
 			  (map (lambda (collector datepair)
@@ -644,7 +651,7 @@ developing over time"))
            (gnc:html-document-add-object!
             document
             (gnc:html-make-empty-data-warning
-	     report-title (gnc:report-id report-obj)))))
+	     report-title (gnc:report-id report-obj))))))
         
 	;; else if no accounts selected
         (gnc:html-document-add-object! 

commit 18f0d053b04f463263f67bbe16bbd8ee2979a818
Author: Christian Stimming <christian at cstimming.de>
Date:   Sun Mar 4 00:18:39 2018 +0100

    Fix auto-selection of splits in reconcile
    
    Really use all splits of any given day. Up to now usually the splits
    of the given date were not or not all included, as the time comparison
    didn't correctly ignore any given time-of-day of the splits. Instead,
    all possible time-of-days should be included.

diff --git a/src/gnome/reconcile-view.c b/src/gnome/reconcile-view.c
index e8ea5b1..454c636 100644
--- a/src/gnome/reconcile-view.c
+++ b/src/gnome/reconcile-view.c
@@ -328,6 +328,7 @@ gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
 
     if (auto_check)
     {
+        time64 statement_date_day_end = gnc_time64_get_day_end(statement_date);
         for (splits = qof_query_run (query); splits; splits = splits->next)
         {
             Split *split = splits->data;
@@ -338,7 +339,7 @@ gnc_reconcile_view_new (Account *account, GNCReconcileViewType type,
             g_assert (recn == NREC || recn == CREC);
 
             if (recn == CREC &&
-		gnc_difftime (trans_date, statement_date) <= 0)
+		gnc_difftime (trans_date, statement_date_day_end) <= 0)
 		g_hash_table_insert (view->reconciled, split, split);
         }
     }

commit 335082480d106226aef1397ed6be2ceb80febeb8
Author: Di Mang <dimang.freenet at gmail.com>
Date:   Sat Mar 3 22:08:39 2018 +0100

    Revision and expansion of accounts for the Russian language.
    In addition, replacing of commodity: USD => RUB.

diff --git a/data/accounts/ru/CMakeLists.txt b/data/accounts/ru/CMakeLists.txt
index 0466b71..52c7293 100644
--- a/data/accounts/ru/CMakeLists.txt
+++ b/data/accounts/ru/CMakeLists.txt
@@ -1,7 +1,11 @@
 SET(account_DATA
+  acctchrt_auto.gnucash-xea
+  acctchrt_autoloan.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_homeloan.gnucash-xea
   acctchrt_homeown.gnucash-xea
+  acctchrt_kids.gnucash-xea
+  acctchrt_otherloan.gnucash-xea
   acctchrt_renter.gnucash-xea)
 
 SET_DIST_LIST(RU_DIST ${account_DATA} CMakeLists.txt)
diff --git a/data/accounts/ru/acctchrt_auto.gnucash-xea b/data/accounts/ru/acctchrt_auto.gnucash-xea
new file mode 100644
index 0000000..c679221
--- /dev/null
+++ b/data/accounts/ru/acctchrt_auto.gnucash-xea
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Автомобиль
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на автомобиль
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с автомобилем.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Головной счет</act:name>
+  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+  <act:type>ROOT</act:type>
+  <act:commodity-scu>0</act:commodity-scu>
+</gnc:account> 
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспорт</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автомобиль</act:name>
+  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы на автомобиль</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Сборы</act:name>
+  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Сборы</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Топливо</act:name>
+  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Топливо</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Парковка</act:name>
+  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Парковка</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Ремонт и обслуживание</act:name>
+  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Ремонт и обслуживание</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Гараж</act:name>
+  <act:id type="new">5630f036a6b1aa8f37d4fdc51e7632a2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Гараж</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Транспортный налог</act:name>
+  <act:id type="new">6b242114ac2c3a1bda48df1f6b4db3fe</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Транспортный налог</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Автостраховка</act:name>
+  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Страхование автотранспорта</act:description>
+  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_autoloan.gnucash-xea
similarity index 68%
copy from data/accounts/ru/acctchrt_homeloan.gnucash-xea
copy to data/accounts/ru/acctchrt_autoloan.gnucash-xea
index 1d0b11b..e42eeb7 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_autoloan.gnucash-xea
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на автомобиль
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на автомобиль
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на автомобиль.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
-  <act:name>Root Account</act:name>
+  <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,32 +51,32 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Автокредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Проценты</act:name>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Кредит на автомобиль</act:name>
+  <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на автомобиль</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_common.gnucash-xea b/data/accounts/ru/acctchrt_common.gnucash-xea
index c304444..37715e6 100644
--- a/data/accounts/ru/acctchrt_common.gnucash-xea
+++ b/data/accounts/ru/acctchrt_common.gnucash-xea
@@ -7,9 +7,10 @@
       Базовый набор наиболее используемых счетов
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Большинство пользователей предпочитает этот набор счетов. Он включает наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
-  </gnc-act:long-description>    
-  <gnc-act:start-selected>1</gnc-act:start-selected>
+      Наиболее часто используемые счета (чеки, депозиты, наличные, кредитные карты, доходы, общие расходы).
+    </gnc-act:long-description>
+    <gnc-act:start-selected>1</gnc-act:start-selected>
+
 <gnc:account version="2.0.0">
   <act:name>Головной счет</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -22,7 +23,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Активы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -39,7 +40,7 @@
   <act:type>ASSET</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Текущие активы</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
@@ -56,7 +57,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековый счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -67,7 +68,7 @@
   <act:type>BANK</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитный счет</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
@@ -78,18 +79,18 @@
   <act:type>CASH</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Наличные</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Долги</act:name>
+  <act:name>Обязательства</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Долги</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -106,7 +107,7 @@
   <act:type>CREDIT</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Кредитная карта</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
@@ -117,7 +118,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Доходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -129,15 +130,37 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
+  <act:name>Работа</act:name>
+  <act:id type="new">558d76b1e4eb0ede3dd364ed705e9617</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Премия</act:description>
+  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Заработная плата</act:name>
+  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Заработная плата</act:description>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
   <act:name>Премия</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Премия</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
+  <act:parent type="new">558d76b1e4eb0ede3dd364ed705e9617</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Полученные подарки</act:name>
@@ -145,7 +168,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Полученные подарки</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -156,7 +179,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Процентный доход</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
@@ -167,7 +190,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Чековые проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -178,7 +201,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы с процентов</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -189,7 +212,7 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Депозитные проценты</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
@@ -200,29 +223,18 @@
   <act:type>INCOME</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Другие доходы</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Заработная плата</act:name>
-  <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
-  <act:type>INCOME</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Заработная плата</act:description>
-  <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
@@ -234,158 +246,165 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Корректировка</act:name>
-  <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Корректировка</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Автомобиль</act:name>
-  <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
+  <act:name>Образование</act:name>
+  <act:id type="new">8b686c37652f2a3222642bfa27d34f83</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Расходы на автомобиль</act:description>
+  <act:description>Образование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Сборы</act:name>
-  <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
+  <act:name>Книги</act:name>
+  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Сборы</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Книги</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Топливо</act:name>
-  <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
+  <act:name>Учёба</act:name>
+  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Топливо</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Учёба</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Парковка</act:name>
-  <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
+  <act:name>Подписки</act:name>
+  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Парковка</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Подписки</act:description>
+  <act:parent type="new">8b686c37652f2a3222642bfa27d34f83</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт и обслуживание</act:name>
-  <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
+  <act:name>Связь и телевидение</act:name>
+  <act:id type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ремонт и обслуживание</act:description>
-  <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
+  <act:description>Связь и телевидение</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Банковское обслуживание</act:name>
-  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
+  <act:name>Кабельное телевидение</act:name>
+  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Банковское обслуживание</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Кабельное телевидение</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Книги</act:name>
-  <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
+  <act:name>Телефон</act:name>
+  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Книги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Телефон</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Кабельное телевидение</act:name>
-  <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
+  <act:name>Интернет услуги</act:name>
+  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Кабельное телевидение</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Интернет услуги</act:description>
+  <act:parent type="new">4fb10b6fcb1ab6f6b76e6548060b12f5</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Благотворительность</act:name>
-  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
+  <act:name>Одежда</act:name>
+  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Благотворительность</act:description>
+  <act:description>Одежда</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Одежда</act:name>
-  <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
+  <act:name>Техника</act:name>
+  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Одежда</act:description>
+  <act:description>Техника</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Компьютер</act:name>
-  <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
+  <act:name>Пропитание</act:name>
+  <act:id type="new">2ad4ce1b4f373af407b8a6c81075334e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Компьютер</act:description>
+  <act:description>Пропитание</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Обеды</act:name>
+  <act:name>Столовая</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Обеды</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Столовая</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Учёба</act:name>
-  <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
+  <act:name>Продукты</act:name>
+  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Учёба</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Продукты</act:description>
+  <act:parent type="new">2ad4ce1b4f373af407b8a6c81075334e</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Развлечения</act:name>
@@ -393,7 +412,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Развлечения</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -404,7 +423,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Музыка и кино</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -415,7 +434,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Отдых</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
@@ -426,42 +445,42 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Путешествия</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подарки</act:name>
-  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
+  <act:name>Спорт</act:name>
+  <act:id type="new">d5b698225b04b3f8d8fdb387033e3329</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подарки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Спорт</act:description>
+  <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хозтовары</act:name>
-  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
+  <act:name>Подарки</act:name>
+  <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хозтовары</act:description>
+  <act:description>Подарки</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Хобби</act:name>
-  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
+  <act:name>Хозтовары</act:name>
+  <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Хобби</act:description>
+  <act:description>Хозтовары</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -470,54 +489,54 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Автостраховка</act:name>
-  <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
+  <act:name>Медицинское страхование</act:name>
+  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Автостраховка</act:description>
+  <act:description>Медицинское страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Медстраховка</act:name>
-  <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
+  <act:name>Пенсионное страхование</act:name>
+  <act:id type="new">491e31dcfa7d1193b9c385bff97512e1</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Медстраховка</act:description>
+  <act:description>Пенсионное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование жизни</act:name>
-  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
+  <act:name>Социальное страхование</act:name>
+  <act:id type="new">2e9dc34fd27bbf937b7d89c6db859dba</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование жизни</act:description>
+  <act:description>Социальное страхование</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Химчистка/прачечная</act:name>
-  <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
+  <act:name>Страхование жизни</act:name>
+  <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Химчистка/прачечная</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Страхование жизни</act:description>
+  <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Медицинские расходы</act:name>
@@ -525,7 +544,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Медицинские расходы</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
@@ -536,131 +555,155 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Разное</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Интернет услуги</act:name>
-  <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
+  <act:name>Хобби</act:name>
+  <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Интернет услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Хобби</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Телефон</act:name>
-  <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
+  <act:name>Разное</act:name>
+  <act:id type="new">12f44aff5aeb8aba7be4d3b033aaa1d4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Телефон</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Разное</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественный транспорт</act:name>
-  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
+  <act:name>Благотворительность</act:name>
+  <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественный транспорт</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Благотворительность</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Подписки</act:name>
-  <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
+  <act:name>Банковское обслуживание</act:name>
+  <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Подписки</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Банковское обслуживание</act:description>
+  <act:parent type="new">759deef82e73587bf48a7dd76aa6abe8</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Питание</act:name>
-  <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
+  <act:name>Транспорт</act:name>
+  <act:id type="new">9d0482216d51316b84927898529861f0</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Питание</act:description>
+  <act:description>Транспорт</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Налоги</act:name>
-  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
+  <act:name>Общественный транспорт</act:name>
+  <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Налоги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:description>Общественный транспорт</act:description>
+  <act:parent type="new">9d0482216d51316b84927898529861f0</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Федеральные</act:name>
-  <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
+  <act:name>Налоги</act:name>
+  <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Федеральные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Налоги</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
-<!-- <gnc:account version="2.0.0">
-  <act:name>Medicare</act:name>
-  <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
+<gnc:account version="2.0.0">
+  <act:name>Другие налоги</act:name>
+  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Medicare</act:description>
+  <act:description>Другие налоги</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
-</gnc:account> -->
+</gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Другие налоги</act:name>
-  <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
+  <act:name>Подоходный налог</act:name>
+  <act:id type="new">910d257186603830d831bfdaf03a4e0b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Другие налоги</act:description>
+  <act:description>Подоходный налог</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Общественная безопасность</act:name>
-  <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Общественная безопасность</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Проживание</act:description>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Региональные</act:name>
-  <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
+  <act:name>Ремонт</act:name>
+  <act:id type="new">89d7a0008e9ee88095385186302b1f7b</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Региональные</act:description>
-  <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+  <act:description>Ремонт</act:description>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Коммунальные услуги</act:name>
@@ -668,10 +711,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Коммунальные услуги</act:description>
-  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Электричество</act:name>
@@ -679,7 +722,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Электричество</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -690,7 +733,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вывоз мусора</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -701,7 +744,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Газ</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
@@ -712,27 +755,21 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Вода</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Собственные средства</act:name>
-  <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
-  <act:type>EQUITY</act:type>
+  <act:name>Другие сборы</act:name>
+  <act:id type="new">a8577e227433f26572033068bc7777f5</act:id>
+  <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Собственные средства</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
-  <act:slots>
-    <slot>
-      <slot:key>placeholder</slot:key>
-      <slot:value type="string">true</slot:value>
-    </slot>
-  </act:slots>
+  <act:description>Другие сборы</act:description>
+  <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Начальное сальдо</act:name>
@@ -740,11 +777,12 @@
   <act:type>EQUITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Остаток средств на начало периода</act:description>
-  <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_homeloan.gnucash-xea
index 1d0b11b..d8e26a5 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_homeloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Кредит на недвижимость
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Кредит на недвижимость
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с оплатой кредита на недвижимость.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Ипотечный кредит</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
+  <act:name>Ипотечный кредит</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за кредит на ипотеку</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_homeown.gnucash-xea b/data/accounts/ru/acctchrt_homeown.gnucash-xea
index 99c0bf5..362dc4b 100644
--- a/data/accounts/ru/acctchrt_homeown.gnucash-xea
+++ b/data/accounts/ru/acctchrt_homeown.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gnc-account-example>
+    <gnc-account-example>
     <gnc-act:title>
-      Расходы домовладельца
+      Дом/Квартира
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с домовладением
     </gnc-act:short-description>
     <gnc-act:long-description>
-    Вы можете выбрать этот набор счетов если являетесь домовладельцем. Этот набор предоставляет группу счетов, позволяющую управлять такими расходами, как страховка, налоги и ремонт.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с владением квартирой или домом (страховка, налоги и ремонт).
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -17,11 +18,11 @@
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,36 +34,25 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ремонт дома</act:name>
-  <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Ремонт дома</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
   <act:name>Страхование</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Страхование</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страховка дома</act:name>
+  <act:name>Страхование имущества</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страховка дома</act:description>
+  <act:description>Страхование имущества</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
@@ -71,10 +61,10 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налоги</act:description>
-  <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Налог на имущество</act:name>
@@ -82,11 +72,23 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Налог на имущество</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Земельный налог</act:name>
+  <act:id type="new">6c5c05753e3a6b5eaeb63045ed218374</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Земельный налог</act:description>
+  <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
+</gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_kids.gnucash-xea b/data/accounts/ru/acctchrt_kids.gnucash-xea
new file mode 100644
index 0000000..21b6841
--- /dev/null
+++ b/data/accounts/ru/acctchrt_kids.gnucash-xea
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example>
+    <gnc-act:title>
+      Дети
+    </gnc-act:title>
+    <gnc-act:short-description>
+      Расходы на детей
+    </gnc-act:short-description>
+    <gnc-act:long-description>
+      Счета для учёта расходов связанных с детьми.
+    </gnc-act:long-description>
+
+<gnc:account version="2.0.0">
+  <act:name>Root Account</act:name>
+  <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
+  <act:type>ROOT</act:type>
+  <act:commodity-scu>0</act:commodity-scu>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Доходы</act:name>
+  <act:id type="new">724c2a1128e49b0b28304d372b19f5a1</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Доходы</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Помощь</act:name>
+  <act:id type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Материальная помощь</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">724c2a1128e49b0b28304d372b19f5a1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Пособие на ребёнка</act:name>
+  <act:id type="new">ff445bf61420de7b5df2637060837151</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Пособие на ребёнка</act:description>
+  <act:parent type="new">e49717ff2ec00bf21e657e2d950ac8a9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Расходы</act:name>
+  <act:id type="new">bc39f4d37eb75353f4f971e80b9d2818</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Расходы</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Дети</act:name>
+  <act:id type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Дети</act:description>
+  <act:parent type="new">bc39f4d37eb75353f4f971e80b9d2818</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>  
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Школа</act:name>
+  <act:id type="new">88533a6a943b55551c3fff6043406a67</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Школа</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>Детский сад</act:name>
+  <act:id type="new">5208f9c1e3d68a73ce0a6eda91ba5c61</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>RUB</cmdty:id>
+  </act:commodity>
+  <act:description>Детский сад</act:description>
+  <act:parent type="new">e9b6215bdeb5cc092ca0059a7c9d97a7</act:parent>
+</gnc:account>
+
+</gnc-account-example>
+
+<!-- Local variables: -->
+<!-- mode: xml        -->
+<!-- End:             -->
diff --git a/data/accounts/ru/acctchrt_homeloan.gnucash-xea b/data/accounts/ru/acctchrt_otherloan.gnucash-xea
similarity index 69%
copy from data/accounts/ru/acctchrt_homeloan.gnucash-xea
copy to data/accounts/ru/acctchrt_otherloan.gnucash-xea
index 1d0b11b..13d58c6 100644
--- a/data/accounts/ru/acctchrt_homeloan.gnucash-xea
+++ b/data/accounts/ru/acctchrt_otherloan.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Ипотечный займ
+      Другие кредиты
     </gnc-act:title>
     <gnc-act:short-description>
-	 Счета ипотечного займа и связанных платежей
+      Различные кредиты и связанные с ними платежи
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если взяли ссуду на дом (ипотечный займ, ипотечные выплаты)
-  </gnc-act:long-description>    
+      Счета для различных кредитов и связанных с ними платежей.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Обязательства</act:description>
   <act:slots>
@@ -33,14 +34,14 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Займы</act:name>
+  <act:name>Кредиты</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Займы</act:description>
+  <act:description>Кредиты</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
   <act:slots>
     <slot>
@@ -50,23 +51,23 @@
   </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные займы</act:name>
-  <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные займы</act:description>
+  <act:description>Кредит (потребительский)</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Расходы</act:name>
-  <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
+  <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -83,22 +84,29 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Проценты</act:description>
-  <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+  <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Ипотечные проценты</act:name>
-  <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
+  <act:name>Другие кредиты</act:name>
+  <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Ипотечные проценты</act:description>
+  <act:description>Проценты за другие кредиты</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->
diff --git a/data/accounts/ru/acctchrt_renter.gnucash-xea b/data/accounts/ru/acctchrt_renter.gnucash-xea
index d1b1d2d..061bbc7 100644
--- a/data/accounts/ru/acctchrt_renter.gnucash-xea
+++ b/data/accounts/ru/acctchrt_renter.gnucash-xea
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gnc-account-example>
     <gnc-act:title>
-      Арендные расходы
+      Аренда
     </gnc-act:title>
     <gnc-act:short-description>
       Расходы связанные с арендой недвижимости
     </gnc-act:short-description>
     <gnc-act:long-description>
-	Вы можете выбрать этот набор счетов, если арендуете дом, квартиру или другую недвижимость.
-  </gnc-act:long-description>    
+      Счета для учёта расходов связанных с арендой дома или квартиры.
+    </gnc-act:long-description>
+
 <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
@@ -21,7 +22,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Расходы</act:description>
   <act:slots>
@@ -33,26 +34,21 @@
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Страхование</act:name>
-  <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
+  <act:name>Проживание</act:name>
+  <act:id type="new">19931e1ab10d980a9209aecab4665a54</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
-  <act:description>Страхование</act:description>
+  <act:description>Проживание</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
-</gnc:account>
-<gnc:account version="2.0.0">
-  <act:name>Страховка аренды</act:name>
-  <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
-  <act:type>EXPENSE</act:type>
-  <act:commodity>
-    <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
-  </act:commodity>
-  <act:description>Страховка аренды</act:description>
-  <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>Арендная плата</act:name>
@@ -60,11 +56,12 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>USD</cmdty:id>
+    <cmdty:id>RUB</cmdty:id>
   </act:commodity>
   <act:description>Арендная плата</act:description>
-  <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
+  <act:parent type="new">19931e1ab10d980a9209aecab4665a54</act:parent>
 </gnc:account>
+
 </gnc-account-example>
 
 <!-- Local variables: -->



Summary of changes:
 data/accounts/ru/CMakeLists.txt                    |   4 +
 data/accounts/ru/acctchrt_auto.gnucash-xea         | 146 +++++++
 ...n.gnucash-xea => acctchrt_autoloan.gnucash-xea} |  52 ++-
 data/accounts/ru/acctchrt_common.gnucash-xea       | 466 +++++++++++----------
 data/accounts/ru/acctchrt_homeloan.gnucash-xea     |  44 +-
 data/accounts/ru/acctchrt_homeown.gnucash-xea      |  52 +--
 .../{de_AT => ru}/acctchrt_kids.gnucash-xea        |  70 +++-
 ....gnucash-xea => acctchrt_otherloan.gnucash-xea} |  48 ++-
 data/accounts/ru/acctchrt_renter.gnucash-xea       |  39 +-
 gnucash/gnome/reconcile-view.c                     |   3 +-
 10 files changed, 583 insertions(+), 341 deletions(-)
 create mode 100644 data/accounts/ru/acctchrt_auto.gnucash-xea
 copy data/accounts/ru/{acctchrt_homeloan.gnucash-xea => acctchrt_autoloan.gnucash-xea} (68%)
 copy data/accounts/{de_AT => ru}/acctchrt_kids.gnucash-xea (57%)
 copy data/accounts/ru/{acctchrt_homeloan.gnucash-xea => acctchrt_otherloan.gnucash-xea} (69%)