gnucash master: Multiple changes pushed

Tue Aug 27 11:26:12 EDT 2019

Updated	 via  https://github.com/Gnucash/gnucash/commit/cbd6dea4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9a48122d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2fa44263 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/f4a1b2fd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d963ca0d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/13d31797 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/90da06b8 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/02f03235 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e4af626d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7db2ccc4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ebdebb0a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/54dae108 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/18aff5d1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0d35e7c6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/6b0bfa07 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d7813206 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cc222515 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8c2f5fb7 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4de2e2b9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/04aab7ce (commit)
	 via  https://github.com/Gnucash/gnucash/commit/bdb85888 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d1cfea02 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e8543008 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7dc59950 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c4a21bc9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/0e9e3c10 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/9b6df51e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/17848038 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/919c2b30 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/3d608efc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/67751665 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/123033e5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/53b7cba1 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/33223970 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5384f319 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/ce638f30 (commit)
	from  https://github.com/Gnucash/gnucash/commit/a9bf2f8c (commit)



commit cbd6dea4ba9026d596720275f66bf42437a27135
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Aug 27 17:26:04 2019 +0200

    Fix distcheck after locale tax changes

diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt
index f51877241..82751602e 100644
--- a/libgnucash/tax/CMakeLists.txt
+++ b/libgnucash/tax/CMakeLists.txt
@@ -64,11 +64,11 @@ gnc_add_scheme_deprecated_module ("gnucash tax us" "gnucash locale us tax" "scm-
 add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 )
 
 set(de_DE_tax_EXTRA_DIST
-    "de_DE/taxtxf-LIES MICH.txt"
-    "de_DE/txf-Ust-Bericht.html"
-    "de_DE/txf-Ust-VA Anleitung 2011.pdf")
+    "de_DE/taxtxf - LIES MICH.txt"
+    "de_DE/txf-USt-Bericht.html"
+    "de_DE/txf-USt-VA Anleitung 2011.pdf")
 set_local_dist(tax_DIST_local CMakeLists.txt ${locale_tax_SOURCES}
     ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2}
     ${gncmod_tax_de_DE_SCHEME_1} ${gncmod_tax_de_DE_SCHEME_2}
-    $de_DE_tax_EXTRA_DIST)
+    ${de_DE_tax_EXTRA_DIST})
 set(tax_DIST ${tax_DIST_local} ${locale_tax_DIST} ${test_locale_tax_DIST} PARENT_SCOPE)

commit 9a48122d417eacab51bbe0e73a462841d70ef7a6
Merge: a9bf2f8cc 2fa442638
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Tue Aug 27 17:25:41 2019 +0200

    Merge maint

diff --cc gnucash/gnome/CMakeLists.txt
index b16eaf4ba,444f20439..848d878f1
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@@ -216,34 -216,6 +229,34 @@@ add_custom_target(gnucash-desktop ALL D
  
  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
  
 +# Scheme
 +
 +set(gnome_SCHEME
 +    report-menus.scm
 +)
 +
 +set(GUILE_OUTPUT_DIR   gnucash)
 +set(GUILE_DEPENDS
 +    gncmod-gnome-utils
 +    scm-engine
 +    scm-gettext
 +    scm-gnome-utils
 +    scm-gnc-module
 +    scm-scm
 +    scm-report
 +    scm-reports
 +)
 +
 +gnc_add_scheme_targets(scm-gnome
 +"${gnome_SCHEME}"
 +${GUILE_OUTPUT_DIR}
 +"${GUILE_DEPENDS}"
 +FALSE
 +)
 +
 +# Module interfaces deprecated in 4.x, will be removed for 5.x
 +gnc_add_scheme_deprecated_module ("gnucash report report-gnome" "gnucash report-menus" "scm-gnome" "")
 +
  set_dist_list(gnome_DIST
-         CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
+         CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
 -        ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
 +        ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES} ${gnome_SCHEME})
diff --cc po/POTFILES.in
index 36cc528b7,61f879b4f..cebc9dd8e
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -91,13 -87,11 +91,13 @@@ gnucash/gnome/gnc-plugin-page-report.
  gnucash/gnome/gnc-plugin-page-sx-list.c
  gnucash/gnome/gnc-plugin-register2.c
  gnucash/gnome/gnc-plugin-register.c
 +gnucash/gnome/gnc-plugin-report-system.c
  gnucash/gnome/gnc-split-reg2.c
  gnucash/gnome/gnc-split-reg.c
- gnucash/gnome/gnucash.appdata.xml.in
+ gnucash/gnome/gnucash.appdata.xml.in.in
  gnucash/gnome/gnucash.desktop.in.in
  gnucash/gnome/reconcile-view.c
 +gnucash/gnome/report-menus.scm
  gnucash/gnome/search-owner.c
  gnucash/gnome/top-level.c
  gnucash/gnome/window-autoclear.c

commit 2fa442638dd2c86be0dd21c472e330b7eaf80085
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Aug 27 22:16:27 2019 +0800

    fix typo in he/CMakelists.txt templates dist_list

diff --git a/data/accounts/he/CMakeLists.txt b/data/accounts/he/CMakeLists.txt
index e10868345..43a9812bb 100644
--- a/data/accounts/he/CMakeLists.txt
+++ b/data/accounts/he/CMakeLists.txt
@@ -18,7 +18,7 @@ set(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-set_dist_list(he_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(HE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
 install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/he)
 file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/he_HE)

commit f4a1b2fdf2dbf1bbb5abd3a96a64fbdba3fcf2d4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Tue Aug 27 21:50:32 2019 +0800

    Revert "[standard-reports] modernise to srfi-9 records"
    
    This reverts commit
    123033e5ea31beb21dc1e75cb50c9cf5432cc34a. Unfortunately srfi-9 records
    don't travel well outside modules, so, will fail on master.

diff --git a/gnucash/report/standard-reports/standard-reports.scm b/gnucash/report/standard-reports/standard-reports.scm
index 321f0997d..235f763c8 100644
--- a/gnucash/report/standard-reports/standard-reports.scm
+++ b/gnucash/report/standard-reports/standard-reports.scm
@@ -25,7 +25,6 @@
 
 
 (define-module (gnucash report standard-reports))
-(use-modules (srfi srfi-9))
 (use-modules (srfi srfi-13))
 (use-modules (gnucash utilities))
 (use-modules (gnucash core-utils))
@@ -40,15 +39,26 @@
 ;; or without split.  If no function is found, then run the 'default'
 ;; function
 
-(define-record-type :acct-type-info
-  (make-acct-type-private split non-split)
-  acct-type-info?
-  (split get-split set-split)
-  (non-split get-non-split set-non-split))
+(define acct-type-info (make-record-type "AcctTypeInfo" '(split non-split)))
+
+(define make-acct-type-private
+  (record-constructor acct-type-info '(split non-split)))
 
 (define (make-acct-type)
   (make-acct-type-private #f #f))
 
+(define get-split
+  (record-accessor acct-type-info 'split))
+
+(define set-split
+  (record-modifier acct-type-info 'split))
+
+(define get-non-split
+  (record-accessor acct-type-info 'non-split))
+
+(define set-non-split
+  (record-modifier acct-type-info 'non-split))
+
 (define (gnc:register-report-hook acct-type split? create-fcn)
   (let ((type-info (hash-ref gnc:*register-report-hash* acct-type (make-acct-type))))
     (if split?

commit d963ca0d3ae44c77cd99550617ecc369958eb95c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Aug 24 17:06:58 2019 +0800

    fincalc: remove C accelerator for Clear
    
    because it clashes with Close button

diff --git a/gnucash/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade
index 2573494ec..851138e57 100644
--- a/gnucash/gtkbuilder/dialog-fincalc.glade
+++ b/gnucash/gtkbuilder/dialog-fincalc.glade
@@ -215,12 +215,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="payment_periods_clear_button">
-                                    <property name="label" translatable="yes">_Clear</property>
+                                    <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -272,12 +269,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="interest_rate_clear_button">
-                                    <property name="label" translatable="yes">_Clear</property>
+                                    <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -329,12 +323,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="present_value_clear_button">
-                                    <property name="label" translatable="yes">_Clear</property>
+                                    <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -386,12 +377,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="periodic_payment_clear_button">
-                                    <property name="label" translatable="yes">_Clear</property>
+                                    <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -443,12 +431,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="spacing">6</property>
-                                <child>
-                                  <placeholder/>
-                                </child>
                                 <child>
                                   <object class="GtkButton" id="future_value_clear_button">
-                                    <property name="label" translatable="yes">_Clear</property>
+                                    <property name="label" translatable="yes">Clear</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -634,6 +619,7 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">12</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
@@ -951,9 +937,6 @@
                         <child>
                           <placeholder/>
                         </child>
-                        <child>
-                          <placeholder/>
-                        </child>
                       </object>
                     </child>
                   </object>

commit 13d3179729130f8930f636fe3cd45bed3a6e32e7
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Aug 23 21:14:38 2019 +0800

    Bug 605602 - precision of Financial Calculator seems to depend on locale
    
    * the calc_clicked_cb had mechanism to abort if no fields were
      empty. disable it.
    
    * to convert gnc_numeric to string, the only suitable print_info is
      gnc_share_print_info_places which takes decimal and outputs suitable
      print_info. Not very appropriate, but works.

diff --git a/gnucash/gnome/dialog-fincalc.c b/gnucash/gnome/dialog-fincalc.c
index 8e96f7790..c6d71f956 100644
--- a/gnucash/gnome/dialog-fincalc.c
+++ b/gnucash/gnome/dialog-fincalc.c
@@ -68,6 +68,7 @@ struct _FinCalcDialog
     GtkWidget *payment_combo;
 
     GtkWidget *end_of_period_radio;
+    GtkWidget *precision;
     GtkWidget *discrete_compounding_radio;
 
     GtkWidget *payment_total_label;
@@ -99,6 +100,7 @@ void fincalc_update_calc_button_cb(GtkWidget *unused, FinCalcDialog *fcd);
 void fincalc_calc_clicked_cb(GtkButton *button, FinCalcDialog *fcd);
 void fincalc_compounding_radio_toggled(GtkToggleButton *togglebutton, gpointer data);
 void fincalc_amount_clear_clicked_cb(GtkButton *button, FinCalcDialog *fcd);
+void fincalc_precision_spin_value_changed_cb (GtkButton *button, FinCalcDialog *fcd);
 void fincalc_response_cb (GtkDialog *dialog, gint response, FinCalcDialog *fcd);
 
 /** Implementations *****************************************************/
@@ -128,7 +130,7 @@ normalize_period(unsigned int *period)
 static void
 fi_to_gui(FinCalcDialog *fcd)
 {
-    const gnc_commodity *commodity;
+    int precision;
     static char string[64];
     gnc_numeric total;
     gnc_numeric npp;
@@ -153,12 +155,11 @@ fi_to_gui(FinCalcDialog *fcd)
 
     pmt = double_to_gnc_numeric (fcd->financial_info.pmt, 100000, GNC_HOW_RND_ROUND_HALF_UP);
 
-    commodity = gnc_default_currency ();
+    precision = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(fcd->precision));
 
-    total = gnc_numeric_mul (npp, pmt, gnc_commodity_get_fraction (commodity),
-                             GNC_HOW_RND_ROUND_HALF_UP);
+    total = gnc_numeric_mul (npp, pmt, GNC_DENOM_AUTO, GNC_HOW_RND_ROUND);
 
-    xaccSPrintAmount (string, total, gnc_default_print_info (FALSE));
+    xaccSPrintAmount (string, total, gnc_share_print_info_places (precision));
     gtk_label_set_text (GTK_LABEL(fcd->payment_total_label), string);
 
     i = normalize_period(&fcd->financial_info.CF);
@@ -280,6 +281,12 @@ fincalc_amount_clear_clicked_cb(GtkButton *button, FinCalcDialog *fcd)
         gtk_entry_set_text(edit, "");
 }
 
+void
+fincalc_precision_spin_value_changed_cb (GtkButton *button, FinCalcDialog *fcd)
+{
+    gtk_widget_set_sensitive (GTK_WIDGET(fcd->calc_button), TRUE);
+}
+
 static void
 init_fi(FinCalcDialog *fcd)
 {
@@ -427,7 +434,6 @@ calc_value(FinCalcDialog *fcd, FinCalcValue value)
         fi_calc_future_value(&fcd->financial_info);
         break;
     default:
-        PERR("Unknown financial variable");
         break;
     }
 
@@ -450,6 +456,7 @@ fincalc_calc_clicked_cb(GtkButton *button, FinCalcDialog *fcd)
         calc_value(fcd, i);
         return;
     }
+    calc_value(fcd, NUM_FIN_CALC_VALUES);
 }
 
 void fincalc_response_cb (GtkDialog *dialog,
@@ -555,8 +562,10 @@ gnc_ui_fincalc_dialog_create(GtkWindow *parent)
     GtkWidget *button;
     GtkWidget *combo;
     GtkWidget *edit;
+    GtkWidget *spin;
     GtkWidget *hbox;
     GtkBuilder *builder;
+    GtkAdjustment *adjustment;
 
     if (gnc_forall_gui_components (DIALOG_FINCALC_CM_CLASS,
                                    show_handler, NULL))
@@ -655,6 +664,11 @@ gnc_ui_fincalc_dialog_create(GtkWindow *parent)
     g_signal_connect(fcd->compounding_combo, "changed",
                      G_CALLBACK (fincalc_update_calc_button_cb), fcd);
 
+    spin = GTK_WIDGET (gtk_builder_get_object (builder, "precision_spin"));
+    adjustment = gtk_adjustment_new (2, 0, 10, 1, 1, 1);
+    gtk_spin_button_set_adjustment (GTK_SPIN_BUTTON(spin), adjustment);
+    fcd->precision = spin;
+
     button = GTK_WIDGET(gtk_builder_get_object (builder, "period_payment_radio"));
     fcd->end_of_period_radio = button;
 
diff --git a/gnucash/gtkbuilder/dialog-fincalc.glade b/gnucash/gtkbuilder/dialog-fincalc.glade
index c7a9bdb2f..2573494ec 100644
--- a/gnucash/gtkbuilder/dialog-fincalc.glade
+++ b/gnucash/gtkbuilder/dialog-fincalc.glade
@@ -477,6 +477,46 @@
                             <property name="position">4</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkBox" id="vbox83">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <child>
+                              <object class="GtkLabel" id="label803">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Precision</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkSpinButton" id="precision_spin">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="input_purpose">number</property>
+                                <property name="climb_rate">1</property>
+                                <property name="numeric">True</property>
+                                <property name="value">1</property>
+                                <signal name="value-changed" handler="fincalc_precision_spin_value_changed_cb" swapped="no"/>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">5</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="GtkAlignment" id="alignment31">
                             <property name="visible">True</property>
@@ -509,7 +549,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">5</property>
+                            <property name="position">6</property>
                           </packing>
                         </child>
                       </object>

commit 90da06b8af5bc426ae530a1b913a41175e4908e7
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Aug 26 21:31:05 2019 +0800

    [dialog-import] connect delete_event to gnc_gen_trans_list_delete

diff --git a/gnucash/gtkbuilder/dialog-import.glade b/gnucash/gtkbuilder/dialog-import.glade
index 74e040d92..d144f3a45 100644
--- a/gnucash/gtkbuilder/dialog-import.glade
+++ b/gnucash/gtkbuilder/dialog-import.glade
@@ -1212,6 +1212,7 @@
     <property name="default_height">400</property>
     <property name="type_hint">dialog</property>
     <signal name="close" handler="on_matcher_cancel_clicked" swapped="no"/>
+    <signal name="delete-event" handler="on_matcher_delete_event" swapped="no"/>
     <child>
       <placeholder/>
     </child>
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 3ec947266..0eaf2b88c 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -99,6 +99,7 @@ static QofLogModule log_module = G_MOD_IMPORT_MATCHER;
 
 void on_matcher_ok_clicked (GtkButton *button, GNCImportMainMatcher *info);
 void on_matcher_cancel_clicked (GtkButton *button, gpointer user_data);
+gboolean on_matcher_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data);
 void on_matcher_help_clicked (GtkButton *button, gpointer user_data);
 void on_matcher_help_close_clicked (GtkButton *button, gpointer user_data);
 
@@ -227,6 +228,14 @@ on_matcher_cancel_clicked (GtkButton *button, gpointer user_data)
     gnc_gen_trans_list_delete (info);
 }
 
+gboolean
+on_matcher_delete_event (GtkWidget *widget, GdkEvent *event, gpointer data)
+{
+    GNCImportMainMatcher *info = data;
+    gnc_gen_trans_list_delete (info);
+    return FALSE;
+}
+
 void
 on_matcher_help_close_clicked (GtkButton *button, gpointer user_data)
 {

commit 02f03235bf4f54fb8202cde90d8ed6784192f87f
Merge: 7db2ccc4e e4af626d8
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Aug 26 23:34:03 2019 +0200

    Merge branch 'PR569' into maint
    
    This adds Hebrew account templates


commit e4af626d84c7b7b832d5916df0ac19073b75b64c
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Aug 26 23:29:22 2019 +0200

    he templates: Revert a sporadic "ILS" for consistency

diff --git a/data/accounts/he/acctchrt_brokerage.gnucash-xea b/data/accounts/he/acctchrt_brokerage.gnucash-xea
index e56ce05c8..b489bfffd 100644
--- a/data/accounts/he/acctchrt_brokerage.gnucash-xea
+++ b/data/accounts/he/acctchrt_brokerage.gnucash-xea
@@ -424,7 +424,7 @@
   <act:type>EXPENSE</act:type>
   <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
-    <cmdty:id>ILS</cmdty:id>
+    <cmdty:id>USD</cmdty:id>
   </act:commodity>
   <act:description>×“×ž×™ × ×™×”×•×œ</act:description>
   <act:parent type="new">d971e6172c344b6ce569f1af76b5dce1</act:parent>

commit 7db2ccc4e0e4e8a331df2f93c4358e3cd0312c4f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Mon Aug 26 22:55:41 2019 +0200

    Bug 796819 - bad icon with Spanish localization
    
    Temporary fix for Farsi, which was afffected, too.
    As it is maintained by TP, the final fix has to come from them.

diff --git a/po/fa.po b/po/fa.po
index 6c1115f0f..897d35ece 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -5240,7 +5240,7 @@ msgstr "Ù…Ø¯ÛŒØ±ÛŒØª Ø§Ù…ÙˆØ± Ù…Ø§Ù„ÛŒ"
 #. Icon file name, do not translate or use "gnucash-icon" as msgstr
 #: gnucash/gnome/gnucash.desktop.in.in:11
 msgid "gnucash-icon"
-msgstr "Ø´Ù…Ø§ÛŒÙ„-Ú¯Ù†ÙˆÚ©Ø´"
+msgstr "gnucash-icon"
 
 #. Translators: The abbreviation for 'Reconciled'
 #. in the header row of the register. Please only
@@ -5250,7 +5250,7 @@ msgstr "Ø´Ù…Ø§ÛŒÙ„-Ú¯Ù†ÙˆÚ©Ø´"
 #: gnucash/register/ledger-core/split-register-layout.c:699
 #: gnucash/register/ledger-core/split-register-model.c:306
 msgid "Reconciled:R"
-msgstr "Ù…ØºØ§ÛŒØ±Øªâ€ŒÚ¯ÛŒØ±ÛŒâ€ŒØ´Ø¯Ù‡:Ù…"
+msgstr "Reconciled:Ù…"
 
 #: gnucash/gnome/search-owner.c:138
 msgid "You have not selected an owner"
@@ -7233,7 +7233,6 @@ msgstr "ØØ³Ø§Ø¨Ø¯Ø§Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ø§Ù…ÙˆØ± Ù…Ø§Ù„ÛŒ Ø´Ø®ØµÛŒ Ùˆ Ú©Ø³Ø¨ Ùˆ Ú©Ø§Ø±
 #. * The string can have multiple rows, so you can also add a list of
 #. * contributors.
 #: gnucash/gnome-utils/gnc-main-window.c:4496
-#, fuzzy
 #| msgid "translator_credits"
 msgid "translator-credits"
 msgstr "Ø¹Ù„ÛŒâ€ŒØ§Ú©Ø¨Ø± Ù†Ø¬ÙÛŒØ§ <s.ali.najafian at chmail.ir>ØŒ Û²Û°Û±Û²ØŒ Û²Û°Û±Û³Ù‡Ø¯Ø§ÛŒØª ÙˆØ·Ù†â€ŒØ®ÙˆØ§Ù‡ <hedayat.fwd at gmail.com>ØŒ Û²Û°Û±Û·ØÙ…ÛŒØ¯Ø±Ø¶Ø§ Ø¬Ø¹ÙØ±ÛŒ <hamidrjafari at gmail.com>ØŒ Û²Û°Û±Û¸"
@@ -18206,7 +18205,7 @@ msgstr ""
 #: gnucash/register/ledger-core/split-register-layout.c:642
 #: gnucash/register/ledger-core/split-register-layout.c:650
 msgid "sample:12/12/2000"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡ :â€ŒÛ²Û°Û°Û°/Û±Û²/Û±Û²"
+msgstr "sample:â€ŒÛ²Û°Û°Û°/Û±Û²/Û±Û²"
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:85
 msgid "sample:Description of an Entry"
@@ -18214,17 +18213,17 @@ msgstr ""
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:89
 msgid "sample:Action"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡:Ú©Ù†Ø´"
+msgstr "sample:Ú©Ù†Ø´"
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:93
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:101
 msgid "sample:9,999.00"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡ : Û¹,Û¹Û¹Û¹.Û°Û°"
+msgstr "sample: Û¹,Û¹Û¹Û¹.Û°Û°"
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:97
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:137
 msgid "sample:999,999.00"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡ : Û¹Û¹Û¹,Û¹Û¹Û¹.Û°Û°"
+msgstr "sample: Û¹Û¹Û¹,Û¹Û¹Û¹.Û°Û°"
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:106
 msgid "sample(DT):+%"
@@ -18255,7 +18254,7 @@ msgstr ""
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:141
 msgid "sample:999.00"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡ : Û¹Û¹Û¹.Û°Û°"
+msgstr "sample: Û¹Û¹Û¹.Û°Û°"
 
 #: gnucash/register/ledger-core/gncEntryLedgerLayout.c:145
 msgid "sample:BI"
@@ -18541,7 +18540,7 @@ msgstr ""
 #: gnucash/register/ledger-core/split-register-layout.c:817
 #: gnucash/register/ledger-core/split-register-layout.c:869
 msgid "sample:999,999.000"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡:999,999.000"
+msgstr "sample:999,999.000"
 
 #: gnucash/register/ledger-core/split-register-layout.c:751
 msgid "sample:Memo field sample text string"
@@ -18566,7 +18565,7 @@ msgstr ""
 #: gnucash/register/ledger-core/split-register-layout.c:853
 #: gnucash/register/ledger-core/split-register-layout.c:861
 msgid "sample:(x + 0.33 * y + (x+y) )"
-msgstr "Ù†Ù…ÙˆÙ†Ù‡:(x + 0.33 * y + (x+y) )"
+msgstr "sample:(x + 0.33 * y + (x+y) )"
 
 #: gnucash/register/ledger-core/split-register-load.c:278
 msgid "Could not determine the account currency. Using the default currency provided by your system."

commit ebdebb0a5bb5422a0f05c37df930c05da58b9c8d
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 19:01:21 2019 +0200

    Clarify the translation remark for the gnucash-icon

diff --git a/gnucash/gnome/gnucash.desktop.in.in b/gnucash/gnome/gnucash.desktop.in.in
index 2d1596db1..654479303 100644
--- a/gnucash/gnome/gnucash.desktop.in.in
+++ b/gnucash/gnome/gnucash.desktop.in.in
@@ -6,7 +6,7 @@ Name=GnuCash
 GenericName=Finance Management
 Comment=Manage your finances, accounts, and investments
 Exec=gnucash %f
-# Icon file name, do not translate or use "gnucash-icon" as msgstr
+# Icon file name, do not translate unless you also provide a localized icon file. Alternatively use the English "gnucash-icon" as msgstr
 Icon=gnucash-icon
 StartupNotify=true
 Terminal=false

commit 54dae108a6281d22aaff6e3035f23002c2c5508b
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 18:57:45 2019 +0200

    Properly mark the renamed appdata.xml.in.in for translation

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 7c2aff7fd..91a03466a 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -73,7 +73,7 @@ function(make_gnucash_potfiles)
   file (GLOB_RECURSE FILES_IN RELATIVE ${CMAKE_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/*.c ${CMAKE_SOURCE_DIR}/*.cpp
     ${CMAKE_SOURCE_DIR}/*.glade ${CMAKE_SOURCE_DIR}/*.desktop.in.in
-    ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.appdata.xml.in
+    ${CMAKE_SOURCE_DIR}/*.gschema.xml.in ${CMAKE_SOURCE_DIR}/*.appdata.xml.in.in
     ${CMAKE_SOURCE_DIR}/*.keys.in ${CMAKE_SOURCE_DIR}/*.scm
     ${CMAKE_SOURCE_DIR}/*/qofbookslots.h
   )
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 09ca6360d..61f879b4f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -89,6 +89,7 @@ gnucash/gnome/gnc-plugin-register2.c
 gnucash/gnome/gnc-plugin-register.c
 gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
+gnucash/gnome/gnucash.appdata.xml.in.in
 gnucash/gnome/gnucash.desktop.in.in
 gnucash/gnome/reconcile-view.c
 gnucash/gnome/search-owner.c

commit 18aff5d1c1743e42450d8cd2a6bfc65c7020d71c
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Wed Aug 21 23:31:11 2019 +0800

    Bug 797355 - General Journal report seems to be off balance
    
    Previously, for general-journal, each split was being analyzed, and
    only the source split was counted for totals. This change will means
    the source split *and* its peers were accounted for.

diff --git a/gnucash/report/standard-reports/register.scm b/gnucash/report/standard-reports/register.scm
index 766952b8f..ec0d6bdb2 100644
--- a/gnucash/report/standard-reports/register.scm
+++ b/gnucash/report/standard-reports/register.scm
@@ -610,20 +610,15 @@
           ;; ----------------------------------------------
           ;; update totals, but don't add them to the table
           ;; ----------------------------------------------
-          (if multi-rows?
-              (for-each
-               (lambda (split)
-                 (if (equal? (xaccSplitGetAccount current)
-                             (xaccSplitGetAccount split))
-                     (accumulate-totals split
-                                        total-collector total-value
-                                        debit-collector debit-value
-                                        credit-collector credit-value)))
-               (xaccTransGetSplitList (xaccSplitGetParent current)))
-              (accumulate-totals current
-                                 total-collector total-value
-                                 debit-collector debit-value
-                                 credit-collector credit-value))
+          (for-each
+           (lambda (split)
+             (accumulate-totals split
+                                total-collector total-value
+                                debit-collector debit-value
+                                credit-collector credit-value))
+           (if multi-rows?
+               (xaccTransGetSplitList (xaccSplitGetParent current))
+               (list current)))
           ;; ----------------------------------
           ;; add the splits to the table
           ;; ----------------------------------
diff --git a/gnucash/report/standard-reports/test/test-register.scm b/gnucash/report/standard-reports/test/test-register.scm
index 05ed5db82..1daba08e3 100644
--- a/gnucash/report/standard-reports/test/test-register.scm
+++ b/gnucash/report/standard-reports/test/test-register.scm
@@ -64,6 +64,10 @@
          (account-alist (create-test-data))
          (bank (cdr (assoc "Bank" account-alist))))
 
+    (gnc-commodity-set-user-symbol
+     (xaccAccountGetCommodity (assoc-ref account-alist "GBP Bank"))
+     "#")
+
     (let ((query (qof-query-create-for-splits)))
       (qof-query-set-book query (gnc-get-current-book))
       (xaccQueryAddAccountMatch query (list bank)
@@ -75,61 +79,93 @@
         231
         (length (sxml->table-row-col sxml 1 #f #f)))
 
-      (test-equal "total debit = 2587"
+      (test-equal "total debit = $2587"
         '("Total Debits" "$2,587.00")
         (sxml->table-row-col sxml 1 -3 #f))
 
-      (test-equal "total credits = 401"
+      (test-equal "total credits = $401"
         '("Total Credits" "$401.00")
         (sxml->table-row-col sxml 1 -1 #f)))
 
     (set-option options "__reg" "journal" #t)
     (let ((sxml (options->sxml options "journal")))
-      (test-equal "table has 333 cells"
-        333
+      (test-equal "table has 337 cells"
+        337
         (length (sxml->table-row-col sxml 1 #f #f)))
 
-      (test-equal "total debit = 2587"
-        '("Total Debits" "$2,587.00")
-        (sxml->table-row-col sxml 1 -3 #f))
+      (test-equal "total debit = #6"
+        '("Total Debits" "#6.00")
+        (sxml->table-row-col sxml 1 135 #f))
 
-      (test-equal "total credits = 401"
-        '("Total Credits" "$401.00")
-        (sxml->table-row-col sxml 1 -1 #f)))
+      (test-equal "total debit = $2979"
+        '("Total Debits" "$2,979.00")
+        (sxml->table-row-col sxml 1 136 #f))
+
+      (test-equal "total credits = #10"
+        '("Total Credits" "#10.00")
+        (sxml->table-row-col sxml 1 138 #f))
+
+      (test-equal "total credits = 2974"
+        '("Total Credits" "$2,974.00")
+        (sxml->table-row-col sxml 1 139 #f)))
 
     (set-option options "__reg" "ledger-type" #t)
     (let ((sxml (options->sxml options "ledger-type")))
-      (test-equal "table has 335 cells"
-        335
+      (test-equal "table has 341 cells"
+        341
         (length (sxml->table-row-col sxml 1 #f #f)))
 
-      (test-equal "total debit = 2587"
-        '("Total Debits" "$2,587.00")
-        (sxml->table-row-col sxml 1 -5 #f))
+      (test-equal "total debit = #6"
+        '("Total Debits" "#6.00")
+        (sxml->table-row-col sxml 1 135 #f))
 
-      (test-equal "total credits = 401"
-        '("Total Credits" "$401.00")
-        (sxml->table-row-col sxml 1 -3 #f))
+      (test-equal "total debit = $2979"
+        '("Total Debits" "$2,979.00")
+        (sxml->table-row-col sxml 1 136 #f))
 
-      (test-equal "net change = 401"
-        '("Net Change" "$2,186.00")
-        (sxml->table-row-col sxml 1 -1 #f)))
+      (test-equal "total credits = #10"
+        '("Total Credits" "#10.00")
+        (sxml->table-row-col sxml 1 138 #f))
+
+      (test-equal "total credits = $2974"
+        '("Total Credits" "$2,974.00")
+        (sxml->table-row-col sxml 1 139 #f))
+
+      (test-equal "net change = #4"
+        '("Net Change" "#4.00")
+        (sxml->table-row-col sxml 1 141 #f))
+
+      (test-equal "net change = $5"
+        '("Net Change" "$5.00")
+        (sxml->table-row-col sxml 1 142 #f)))
 
     (set-option options "__reg" "double" #t)
     (let ((sxml (options->sxml options "double")))
-      (test-equal "table has 339 cells"
-        339
+      (test-equal "table has 345 cells"
+        345
         (length (sxml->table-row-col sxml 1 #f #f)))
 
-      (test-equal "total debit = 2587"
-        '("Total Debits" "$2,587.00")
-        (sxml->table-row-col sxml 1 -5 #f))
+      (test-equal "total debit = #6"
+        '("Total Debits" "#6.00")
+        (sxml->table-row-col sxml 1 179 #f))
 
-      (test-equal "total credits = 401"
-        '("Total Credits" "$401.00")
-        (sxml->table-row-col sxml 1 -3 #f))
+      (test-equal "total debit = $2979"
+        '("Total Debits" "$2,979.00")
+        (sxml->table-row-col sxml 1 180 #f))
 
-      (test-equal "net change = 401"
-        '("Net Change" "$2,186.00")
-        (sxml->table-row-col sxml 1 -1 #f)))
+      (test-equal "total credits = #10"
+        '("Total Credits" "#10.00")
+        (sxml->table-row-col sxml 1 182 #f))
+
+      (test-equal "total credits = $2974"
+        '("Total Credits" "$2,974.00")
+        (sxml->table-row-col sxml 1 183 #f))
+
+      (test-equal "net change = #4"
+        '("Net Change" "#4.00")
+        (sxml->table-row-col sxml 1 185 #f))
+
+      (test-equal "net change = $5"
+        '("Net Change" "$5.00")
+        (sxml->table-row-col sxml 1 186 #f)))
     ))

commit 0d35e7c63d60fc53092a18f00a097554ba4c1ce5
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Aug 24 22:57:02 2019 +0800

    [register] remove unused functions

diff --git a/gnucash/report/standard-reports/register.scm b/gnucash/report/standard-reports/register.scm
index 56d2e22a0..766952b8f 100644
--- a/gnucash/report/standard-reports/register.scm
+++ b/gnucash/report/standard-reports/register.scm
@@ -163,17 +163,6 @@
         (addto! heading-list (_ "Balance")))
     (reverse heading-list)))
 
-(define (gnc:split-get-balance-display split-info? split)
-  (let* ((account (xaccSplitGetAccount split))
-         (balance
-          (if split-info?
-              (xaccSplitGetBalance split)
-              (xaccTransGetAccountBalance
-               (xaccSplitGetParent split) account))))
-    (if (and (not (null? account)) (gnc-reverse-balance account))
-        (- balance)
-        balance)))
-
 (define (add-split-row table split column-vector row-style transaction-info?
                        split-info? action-for-num? ledger-type? double? memo?
                        description? total-collector)
@@ -360,10 +349,6 @@
                                                    (reverse row-contents))))))
     split-value))
 
-(define (lookup-sort-key sort-option)
-  (vector-ref (cdr (assq sort-option comp-funcs-assoc-list)) 0))
-(define (lookup-subtotal-pred sort-option)
-  (vector-ref (cdr (assq sort-option comp-funcs-assoc-list)) 1))
 
 (define (options-generator)
 

commit 6b0bfa075ca5c964e4b2df775b228271b2ecf378
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Aug 24 22:53:31 2019 +0800

    [register] fix Transfer acc for single-account splits
    
    single account splits shouldn't show "-- Split Transaction --" in
    transfer account. show "None".

diff --git a/gnucash/report/standard-reports/register.scm b/gnucash/report/standard-reports/register.scm
index e5673d092..56d2e22a0 100644
--- a/gnucash/report/standard-reports/register.scm
+++ b/gnucash/report/standard-reports/register.scm
@@ -228,16 +228,15 @@
         (addto! row-contents
                 (gnc:make-html-table-cell/markup
                  "text-cell"
-                 (if split-info?
-                     (if transaction-info?
-                         (let ((other-split
-                                (xaccSplitGetOtherSplit split)))
-                           (if (not (null? other-split))
-                               (gnc-account-get-full-name
-                                (xaccSplitGetAccount other-split))
-                               (_ "-- Split Transaction --")))
-                         (gnc-account-get-full-name account))
-                     " "))))
+                 (cond
+                  ((not split-info?) #f)
+                  ((not transaction-info?) (gnc-account-get-full-name account))
+                  (else (case (xaccTransCountSplits (xaccSplitGetParent split))
+                          ((2) (gnc-account-get-full-name
+                                (xaccSplitGetAccount
+                                 (xaccSplitGetOtherSplit split))))
+                          ((1) (_ "None"))
+                          (else (_ "-- Split Transaction --"))))))))
     (if (shares-col column-vector)
         (addto! row-contents
                 (gnc:make-html-table-cell/markup

commit d7813206ce982364c1ba9bff02aa7bef868375d4
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Aug 24 22:38:29 2019 +0800

    [register] compact functions, inline single-use function

diff --git a/gnucash/report/standard-reports/register.scm b/gnucash/report/standard-reports/register.scm
index 58f93da3a..e5673d092 100644
--- a/gnucash/report/standard-reports/register.scm
+++ b/gnucash/report/standard-reports/register.scm
@@ -516,27 +516,23 @@
                 (gnc:monetary-neg monetary)
                 monetary)))
 
-      (if (or single-col credit-col debit-col)
-          (begin
-            (gnc:html-table-append-row!
-             table
-             (list
-              (gnc:make-html-table-cell/size
-               1 (num-columns-required used-columns)
-               (gnc:make-html-text (gnc:html-markup-hr)))))
-
-            (for-each (lambda (currency)
-                        (gnc:html-table-append-row/markup!
-                         table
-                         subtotal-style
-                         (append (cons (gnc:make-html-table-cell/markup
-                                        "total-label-cell" label)
-                                       '())
-                                 (list (gnc:make-html-table-cell/size/markup
-                                        1 (colspan currency)
-                                        "total-number-cell"
-                                        (display-subtotal currency))))))
-                      currency-totals)))))
+      (when (or single-col credit-col debit-col)
+        (gnc:html-table-append-row!
+         table
+         (list
+          (gnc:make-html-table-cell/size
+           1 (num-columns-required used-columns)
+           (gnc:make-html-text (gnc:html-markup-hr)))))
+
+        (for-each
+         (lambda (monetary)
+           (gnc:html-table-append-row/markup!
+            table subtotal-style
+            (list (gnc:make-html-table-cell/markup "total-label-cell" label)
+                  (gnc:make-html-table-cell/size/markup
+                   1 (colspan monetary) "total-number-cell"
+                   (display-subtotal monetary)))))
+         currency-totals))))
 
   (define (accumulate-totals split total-amount total-value
                              debit-amount debit-value
@@ -556,17 +552,6 @@
       (total-amount 'add split-currency split-amount)
       (total-value 'add trans-currency split-value)))
 
-  (define (add-other-split-rows split table used-columns row-style
-                                action-for-num? ledger-type? total-collector)
-    (let loop ((splits (xaccTransGetSplitList (xaccSplitGetParent split))))
-      (when (pair? splits)
-        (add-split-row table (car splits) used-columns row-style #f #t
-                       action-for-num? ledger-type? #f
-                       (opt-val "Display" "Memo")
-                       (opt-val "Display" "Description")
-                       total-collector)
-        (loop (cdr splits)))))
-
   (define (splits-leader splits)
     (let ((accounts (map xaccSplitGetAccount splits)))
       (and (pair? accounts)
@@ -664,10 +649,15 @@
                          double? (opt-val "Display" "Memo")
                          (opt-val "Display" "Description")
                          total-collector)
-          (if multi-rows?
-              (add-other-split-rows current table used-columns
-                                    "alternate-row" action-for-num?
-                                    ledger-type? total-collector))
+          (when multi-rows?
+            (for-each
+             (lambda (split)
+               (add-split-row table split used-columns "alternate-row"
+                              #f #t action-for-num? ledger-type? #f
+                              (opt-val "Display" "Memo")
+                              (opt-val "Display" "Description") total-collector))
+             (xaccTransGetSplitList (xaccSplitGetParent current))))
+
           (loop (cdr splits)
                 (not odd-row?))))))
     table))

commit cc222515a38fcb34cdd96a38e7da72f313a7c81e
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 12:17:39 2019 +0200

    Fix in-tree builds after the appdata file changes
    
    We don't recommend this as it risks tainted build environments. However if
    you know what you're doing it should still work. In particular sandboxed systems
    such as flatpak don't have this problem and hence they do build in-tree.

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 312ce277e..444f20439 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -154,8 +154,8 @@ install(TARGETS gnc-gnome
 # No headers to install
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
-    COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in.in ${VCS_INFO_FILE}
+    COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in.in
                              -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
                              -D VCS_INFO_FILE=${VCS_INFO_FILE}
                              -D SRC_DIR=${CMAKE_SOURCE_DIR}
@@ -217,5 +217,5 @@ add_custom_target(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucas
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
 
 set_dist_list(gnome_DIST
-        CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
+        CMakeLists.txt gnome.i gnucash.appdata.xml.in.in gnucash.desktop.in.in
         ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})
diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in.in
similarity index 100%
rename from gnucash/gnome/gnucash.appdata.xml.in
rename to gnucash/gnome/gnucash.appdata.xml.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 67d490c29..09ca6360d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -89,7 +89,6 @@ gnucash/gnome/gnc-plugin-register2.c
 gnucash/gnome/gnc-plugin-register.c
 gnucash/gnome/gnc-split-reg2.c
 gnucash/gnome/gnc-split-reg.c
-gnucash/gnome/gnucash.appdata.xml.in
 gnucash/gnome/gnucash.desktop.in.in
 gnucash/gnome/reconcile-view.c
 gnucash/gnome/search-owner.c

commit 8c2f5fb7a2d98e9746d2caeb238ce6273b7a4307
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Aug 26 09:24:19 2019 +0200

    Minor tweaks to appdata file generation
    
    * Use cmake's built-in copy command rather than an external one
    * depend directly on gnc-vcs-info.h rather than the global gnc-vcs-info-target
      The latter won't trigger a rerun of the command if gnc-vcs-info.h already exists
      regardless of whether it had changed.

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 4b796201e..312ce277e 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -166,11 +166,11 @@ if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     # Fall back to providing an unmerged (and hence untranslated) appdata file.
     add_custom_command (
         OUTPUT gnucash.appdata.xml
-        COMMAND ${CMAKE_COMMAND} -E env
-           cp ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-              ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+           ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
+           ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml
 
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
         )
 else()
     # FIXME: where does LC_ALL=C come from?
@@ -182,7 +182,7 @@ else()
                 --xml --template ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
                 -d ${CMAKE_SOURCE_DIR}/po
                 -o gnucash.appdata.xml
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
     )
 endif()
 

commit 4de2e2b9c2d96332bb1d3b2228b9e8bab56bcae6
Merge: bdb858883 04aab7cea
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 25 15:55:36 2019 -0700

    Merge Craig Mason-Jones's 'gncnumeric-neg-string' into maint.


commit 04aab7cea3bc8ea47931dde98611668980ec4f65
Author: Craig <craig at lateral.co.za>
Date:   Sat Aug 24 05:45:31 2019 +0200

    Correctly parse decimals between 0 and -1.
    
    The negative sign was being lost because stoll("-0") is 0.
    Also permits parsing decimals between -1 and 1 without the leading 0.

diff --git a/libgnucash/engine/gnc-numeric.cpp b/libgnucash/engine/gnc-numeric.cpp
index a2cbf6d1c..4e4250fdb 100644
--- a/libgnucash/engine/gnc-numeric.cpp
+++ b/libgnucash/engine/gnc-numeric.cpp
@@ -120,7 +120,7 @@ using boost::smatch;
 using boost::regex_search;
 GncNumeric::GncNumeric(const std::string& str, bool autoround)
 {
-    static const std::string numer_frag("(-?[0-9]+)");
+    static const std::string numer_frag("(-?[0-9]*)");
     static const std::string denom_frag("([0-9]+)");
     static const std::string hex_frag("(0x[a-f0-9]+)");
     static const std::string slash( "[ \\t]*/[ \\t]*");
@@ -175,10 +175,13 @@ GncNumeric::GncNumeric(const std::string& str, bool autoround)
     }
     if (regex_search(str, m, decimal))
     {
-        GncInt128 high(stoll(m[1].str()));
+        auto neg = (m[1].length() && m[1].str()[0] == '-');
+        GncInt128 high((neg && m[1].length() > 1) || (!neg && m[1].length()) ?
+                       stoll(m[1].str()) : 0);
         GncInt128 low(stoll(m[2].str()));
         int64_t d = powten(m[2].str().length());
-        GncInt128 n = high * d + (high >= 0 ? low : -low);
+        GncInt128 n = high * d + (neg ? -low : low);
+
         if (!autoround && n.isBig())
         {
             std::ostringstream errmsg;
diff --git a/libgnucash/engine/test/gtest-gnc-numeric.cpp b/libgnucash/engine/test/gtest-gnc-numeric.cpp
index 680b6d82d..5cbe5c724 100644
--- a/libgnucash/engine/test/gtest-gnc-numeric.cpp
+++ b/libgnucash/engine/test/gtest-gnc-numeric.cpp
@@ -179,6 +179,12 @@ TEST(gncnumeric_constructors, test_string_constructor)
                  std::out_of_range);
     EXPECT_THROW(GncNumeric bad_string("Four score and seven"),
                  std::invalid_argument);
+    GncNumeric neg_decimal_frac("-0.12345");
+    EXPECT_EQ(-12345, neg_decimal_frac.num());
+    EXPECT_EQ(100000, neg_decimal_frac.denom());
+    GncNumeric neg_decimal_frac_nozero("-.12345");
+    EXPECT_EQ(-12345, neg_decimal_frac_nozero.num());
+    EXPECT_EQ(100000, neg_decimal_frac_nozero.denom());
 }
 
 TEST(gncnumeric_output, string_output)

commit bdb858883cb013a08683a31b21e1baca91e52eeb
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Aug 25 13:21:08 2019 -0700

    Bug 797377 - cmake fails on debian-8 and ubuntu-14.04...
    
    with gnucash.appdata.xml.in does not exist

diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 6291f27c5..4b796201e 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -164,8 +164,14 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
 if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     # Gettext is too old to be able to merge an appdata file.
     # Fall back to providing an unmerged (and hence untranslated) appdata file.
-    configure_file (${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
-                    ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml COPYONLY)
+    add_custom_command (
+        OUTPUT gnucash.appdata.xml
+        COMMAND ${CMAKE_COMMAND} -E env
+           cp ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
+              ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml
+
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
+        )
 else()
     # FIXME: where does LC_ALL=C come from?
     add_custom_command (

commit d1cfea0239c2ab61b57c870d8bb13d548dd7c3ea
Author: avma <avi.markovitz at gmail.com>
Date:   Sun Aug 25 18:49:36 2019 +0300

    Hebrew COA sets

diff --git a/data/accounts/CMakeLists.txt b/data/accounts/CMakeLists.txt
index 26de0a718..57edce6a0 100644
--- a/data/accounts/CMakeLists.txt
+++ b/data/accounts/CMakeLists.txt
@@ -20,6 +20,7 @@ add_subdirectory(fr_BE)
 add_subdirectory(fr_CA)
 add_subdirectory(fr_CH)
 add_subdirectory(fr_FR)
+add_subdirectory(he)
 add_subdirectory(hr)
 add_subdirectory(hu_HU)
 add_subdirectory(it)
@@ -46,7 +47,7 @@ set_local_dist(dist_list CMakeLists.txt )
 
 set(accounts_DIST ${C_DIST} ${CA_DIST} ${CS_DIST} ${DA_DIST} ${DE_AT_DIST} ${DE_CH_DIST} ${DE_DE_DIST} ${EL_GR_DIST}
                   ${EN_GB_DIST} ${EN_IN_DIST} ${ES_ES_DIST} ${ES_MX_DIST} ${FI_FI_DIST} ${FR_BE_DIST} ${FR_CA_DIST}
-                  ${FR_CH_DIST} ${FR_FR_DIST} ${HR_DIST} ${HU_HU_DIST} ${IT_DIST} ${JA_DIST} ${KO_DIST} ${LT_DIST}
+                  ${FR_CH_DIST} ${FR_FR_DIST} ${HE_DIST} ${HR_DIST} ${HU_HU_DIST} ${IT_DIST} ${JA_DIST} ${KO_DIST} ${LT_DIST}
                   ${LV_DIST} ${NB_DIST} ${NL_DIST} ${PL_DIST} ${PT_BR_DIST} ${PT_PT_DIST} ${RU_DIST} ${SK_DIST}
                   ${SV_AX_DIST} ${SV_FI_DIST} ${SV_SE_DIST} ${TR_TR_DIST} ${ZH_CN_DIST}
                   ${ZH_HK_DIST} ${ZH_TW_DIST} ${dist_list} PARENT_SCOPE)
diff --git a/data/accounts/he/CMakeLists.txt b/data/accounts/he/CMakeLists.txt
new file mode 100644
index 000000000..e10868345
--- /dev/null
+++ b/data/accounts/he/CMakeLists.txt
@@ -0,0 +1,25 @@
+
+
+set(account_DATA
+  acctchrt_brokerage.gnucash-xea
+  acctchrt_business.gnucash-xea
+  acctchrt_carloan.gnucash-xea
+  acctchrt_cdmoneymkt.gnucash-xea
+  acctchrt_checkbook.gnucash-xea
+  acctchrt_childcare.gnucash-xea
+  acctchrt_common.gnucash-xea
+  acctchrt_eduloan.gnucash-xea
+  acctchrt_fixedassets.gnucash-xea
+  acctchrt_homeloan.gnucash-xea
+  acctchrt_homeown.gnucash-xea
+  acctchrt_otherloan.gnucash-xea
+  acctchrt_renter.gnucash-xea
+  acctchrt_retiremt.gnucash-xea
+  acctchrt_spouseinc.gnucash-xea
+  acctchrt_spouseretire.gnucash-xea)
+
+set_dist_list(he_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/he)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/he_HE)
+
diff --git a/data/accounts/he/acctchrt_brokerage.gnucash-xea b/data/accounts/he/acctchrt_brokerage.gnucash-xea
new file mode 100644
index 000000000..e56ce05c8
--- /dev/null
+++ b/data/accounts/he/acctchrt_brokerage.gnucash-xea
@@ -0,0 +1,432 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">52b5942b5beaec856eaca5a75ee71592</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">0efa7e60042a8d5e4f07a2e6f76bb66d</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×©×§×¢×•×ª</act:description>
+  <act:parent type="new">c942789c77cfdd65bc6e4c12900f0805</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">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>× ×™×¨×•×ª ×¢×¨×š</act:description>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">7e0a0149682cc309278987426b5f9b82</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">4599087f4755245fbc052ec425c0094b</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">00710d6bd400e580c7e4f3d0795ef2ab</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">d8e24554e11c296b79b33953cba093de</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª×ª</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨×Ÿ ×¤× ×¡×™×”</act:name>
+  <act:id type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨×Ÿ ×¤× ×¡×™×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string">×‘×˜×•×—×™ ×ž× ×”×œ×™×, ×§×•×¤×•×ª ×’×ž×œ ×•×ª×•×›× ×™×•×ª ×¤× ×¡×™×” ××—×¨×•×ª</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">4c272ebf68c058a45dde6be718ad9321</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">8aa76ecd4acf6b32280711f198787e4f</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">00c1dd188a5a3ffe26baf4afbe358adc</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">f3e62c6cf53adb5637b765b45b8df6c3</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨×Ÿ ×¤× ×¡×™×” ×‘×Ÿ/×‘×ª ×–×•×’</act:name>
+  <act:id type="new">eacb6de7f8896665d150d7dcb0a0b521</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨×Ÿ ×¤× ×¡×™×” ×‘×Ÿ/×‘×ª ×–×•×’</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string">IRA, 401(k), or other retirement</slot:value>
+    </slot>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">aefb6c2cb4fe8ef354f4aaa2d8a6aac6</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">bebd94871a7e14592cae393381e6f733</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">255ac00eae374e6893a934f5094d4d90</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">217ffae020de3df2671b4c247035d9df</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×˜×‘×¢ ×—×•×¥</act:name>
+  <act:id type="new">66641bfe13094125067d5cb9e0bbddf0</act:id>
+  <act:type>CURRENCY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>DEM</cmdty:id>
+  </act:commodity>
+  <act:description>×ž×˜×‘×¢ ×—×•×¥</act:description>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</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">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">f230ee8a41e285ff4b9a02c7a7d1255c</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×ª× ×•×ª ×©× ×ª×§×‘×œ×•</act:name>
+  <act:id type="new">9bb39b906c8797a8a9302087c80a75a3</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ×¨×™×‘×™×ª</act:name>
+  <act:id type="new">0b849fdbc4a52072e7323a86ec6e56d0</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž××’"×—</act:name>
+  <act:id type="new">26528cbd37abdfa623eb237a78eaeb28</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×™×ª×¨×ª ×–×›×•×ª ×‘×‘× ×§</act:name>
+  <act:id type="new">87d975472429aa388923d5674db26e10</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×”×œ×•×•××•×ª ×©× ×ª× ×•</act:name>
+  <act:id type="new">8e12304ec75b0562e8e7e5f1d3ef3f87</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×ž× ×™×•×ª</act:name>
+  <act:id type="new">170912c87f795e4715d22dff03ee68b7</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ×¨×™×‘×™×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">e52426c9cd9b0366a900e617b430d743</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×ª×•×›× ×™×•×ª ×—×™×¡×›×•×Ÿ</act:name>
+  <act:id type="new">236e074cb18481c1c29018ddde5611f2</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">6de23244232785031501171abcc1d4aa</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">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">77fdffddc79c662c93c482cefa5a4744</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">6de23244232785031501171abcc1d4aa</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×ž×™ × ×™×”×•×œ</act:name>
+  <act:id type="new">feab2e317232f98a5ebc859a8b4ee906</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>ILS</cmdty:id>
+  </act:commodity>
+  <act:description>×“×ž×™ × ×™×”×•×œ</act:description>
+  <act:parent type="new">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_business.gnucash-xea b/data/accounts/he/acctchrt_business.gnucash-xea
new file mode 100644
index 000000000..fc9899c94
--- /dev/null
+++ b/data/accounts/he/acctchrt_business.gnucash-xea
@@ -0,0 +1,1443 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  ×—×©×‘×•× ×•×ª×¢×¡×§×™×™×
+</gnc-act:title>
+<gnc-act:short-description>
+  ×ª×¨×©×™× ×¢×¥ ×—×©×‘×•× ×•×ª ×ž×œ× ×¢×‘×•×¨ ×¢×¡×§×™×.
+</gnc-act:short-description>
+<gnc-act:long-description>
+  ×‘×—×¨×• ×œ×”×©×ª×ž×©×‘×ª×¨×©×™× ×—×©×‘×•× ×•×ª ×–×” ×œ× ×™×”×•×œ ×¢×¡×§. ×”×ª×¨×©×™× ×™×ª××™× ×œ×¨×•×‘ ×”×¢×¡×§×™× ×•×›×•×œ×œ ×—×©×‘×•× ×•×ª ×—×™×™×‘×™× ×•×–×›××™×, ×”×•×Ÿ ×•×”×ª×—×™×™×‘×•×™×•×ª, ×”×›× ×¡×•×ª ×•×”×•×¦××•×ª.
+</gnc-act:long-description>
+<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
+<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">4f40ddce996f8f74b4e99f52e275ba14</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">f8532a8cdc024e0178fe20a1482e3192</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¨×›×•×© ×©×•×˜×£</act:description>
+  <act:parent type="new">4f40ddce996f8f74b4e99f52e275ba14</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">8048bd85020e9ecf57b7cb300f4fa7e2</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×‘×•×Ÿ ×¢×•×‘×¨ ×•×©×‘</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f8532a8cdc024e0178fe20a1482e3192</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×©×‘×•×Ÿ ×—×™×¡×›×•×Ÿ</act:name>
+  <act:id type="new">f52774d7ec67a0c59c425a5c041dcc46</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×—×©×‘×•×Ÿ ×—×™×¡×›×•×Ÿ</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+    <slot>
+      <slot:key>last-num</slot:key>
+      <slot:value type="string">130</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f8532a8cdc024e0178fe20a1482e3192</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×•×¤×” ×§×˜× ×”</act:name>
+  <act:id type="new">c292f69c18e01e1b607e37b3188c7acc</act:id>
+  <act:type>CASH</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×§×•×¤×” ×§×˜× ×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f8532a8cdc024e0178fe20a1482e3192</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×™×™×‘×™×</act:name>
+  <act:id type="new">0dd8987a2e860fa231a2a76e75cd5ad1</act:id>
+  <act:type>RECEIVABLE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×—×™×™×‘×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">4f40ddce996f8f74b4e99f52e275ba14</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×ª×—×™×™×‘×•×™×•×ª</act:name>
+  <act:id type="new">b83e860994b160b59dd463cf23636900</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">b9718397ec0aec2d515b09af8b76b59c</act:id>
+  <act:type>CREDIT</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×›×¨×˜×™×¡ ××©×¨××™</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b83e860994b160b59dd463cf23636900</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×–×›××™×</act:name>
+  <act:id type="new">5c0cd58e416a5c3d26b5f4865c77b8b9</act:id>
+  <act:type>PAYABLE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×–×›××™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b83e860994b160b59dd463cf23636900</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">f7a2e8717ea0a2e1801740d2a69b947e</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">77e298a57faf85cacd4a881ade89808c</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×›× ×¡×•×ª ×¨×™×‘×™×ª</act:description>
+  <act:parent type="new">f7a2e8717ea0a2e1801740d2a69b947e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">ba71604fe085423c6e8cb7fd1b7c6f54</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×›× ×¡×•×ª ××—×¨×•×ª</act:description>
+  <act:parent type="new">f7a2e8717ea0a2e1801740d2a69b947e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×—×–×¨ ×”×•×¦××•×ª</act:name>
+  <act:id type="new">eb35aec1095d23f511f0fb9f485808ea</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×—×–×¨ ×”×•×¦××•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f7a2e8717ea0a2e1801740d2a69b947e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×›×™×¨×•×ª</act:name>
+  <act:id type="new">417141d0cd268c6a6ddd8ffe8c7ffbd3</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×›×™×¨×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f7a2e8717ea0a2e1801740d2a69b947e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">1eca26f16967a1627df155e49b44a609</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">449348af19db1039e6c7d94a16a0acb0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¤×¢×•×œ×•×ª ×ª×™×§×•×Ÿ ×•×”×ª××ž×”</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×›×‘</act:name>
+  <act:id type="new">63a1cc17910a125405c1ec2aee831839</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¨×›×‘</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¢×ž×œ×•×ª</act:name>
+  <act:id type="new">acd4d91784ebf99df24df143c5abd40d</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¢×ž×œ×•×ª</act:description>
+  <act:parent type="new">63a1cc17910a125405c1ec2aee831839</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×œ×§</act:name>
+  <act:id type="new">193f61c6db492e1ab56b2db714e2b574</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×“×œ×§</act:description>
+  <act:parent type="new">63a1cc17910a125405c1ec2aee831839</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—× ×™×”</act:name>
+  <act:id type="new">4fd0ae3399a3886c2098184c1b8afaac</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×—× ×™×”</act:description>
+  <act:parent type="new">63a1cc17910a125405c1ec2aee831839</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××—×–×§×” ×•×ª×™×§×•× ×™×</act:name>
+  <act:id type="new">280f5d3834093afe91cd6cb0a38859f1</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××—×–×§×” ×•×ª×™×§×•× ×™×</act:description>
+  <act:parent type="new">63a1cc17910a125405c1ec2aee831839</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×™×¨×•×ª×™× ×‘× ×§××™×™×</act:name>
+  <act:id type="new">fa2ecbabb5148039e3b57bfd81860ab7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×™×¨×•×ª×™× ×‘× ×§××™×™×</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¡×¤×¨×•×ª</act:name>
+  <act:id type="new">f7f99917ec28fa9ea35159932d94cfd7</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¡×¤×¨×•×ª</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”× ×—×•×ª ×ž×–×•×ž×Ÿ ×©× ×ª× ×•</act:name>
+  <act:id type="new">9ea3de1d573f7e8870da901c69aae16d</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”× ×—×•×ª ×ž×–×•×ž×Ÿ ×©× ×ª× ×•</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¨×•×ž×•×ª</act:name>
+  <act:id type="new">bf4c7466be71d858509cbb3d943dea8f</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ª×¨×•×ž×•×ª</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¤×—×ª</act:name>
+  <act:id type="new">f7d4a3a1b78da69ff2b13e58069faf37</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¤×—×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨×•×—</act:name>
+  <act:id type="new">6fbc4c042f0c99197a18bff34b6f46f6</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××¨×•×—</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×ž×™ ×—×‘×¨ ×•×ž×™× ×•×™×™×</act:name>
+  <act:id type="new">612281a39aa174553c625d641e66c1da</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×“×ž×™ ×—×‘×¨ ×•×ž×™× ×•×™×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×©×›×œ×”</act:name>
+  <act:id type="new">2111b519274e18f8b2083f07b39b53d9</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×©×›×œ×”</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×›×™×¨×•×ª ×¦×™×•×“</act:name>
+  <act:id type="new">c8e75ad8eb7085ac73b3b626d02a3c44</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×›×™×¨×•×ª ×¦×™×•×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×—</act:name>
+  <act:id type="new">0ff061c9c27535d3b8629a333b02a7a0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×‘×™×˜×•×—</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— × ×›×•×ª</act:name>
+  <act:id type="new">793001c2cac93c78d7b0e09b8d06e288</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×‘×™×˜×•×— × ×›×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0ff061c9c27535d3b8629a333b02a7a0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×—×‘×•×ª ×¦×“ ×’'</act:name>
+  <act:id type="new">3d2a415bd4b7571c77d6f4393633b0c8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×‘×™×˜×•×— ×—×‘×•×ª ×¦×“ ×’'</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0ff061c9c27535d3b8629a333b02a7a0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¡×•×¦×™××œ×™×•×ª</act:name>
+  <act:id type="new">82039e73ec25135aec45956bf44ebc0e</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¡×•×¦×™××œ×™×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0ff061c9c27535d3b8629a333b02a7a0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×•×¨×™×©×™×•× ×•×ª</act:name>
+  <act:id type="new">f644476f4343a75b933c870b42a173c0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××’×¨×•×ª ×•×¨×™×©×™×•× ×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×•× ×•×ª</act:name>
+  <act:id type="new">a852eae755fac5678744699065345a58</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×•× ×•×ª</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¦×•×¨×›×™ ×ž×©×¨×“</act:name>
+  <act:id type="new">62ea56cdde93f5c1de58386050ad7cb4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¦×•×¨×›×™ ×ž×©×¨×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×™×¨×•×ª×™ ×—×•×¥</act:name>
+  <act:id type="new">4f5265128a7a8d56820db2698cd1dadf</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×™×¨×•×ª×™ ×—×•×¥</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª ×©×›×¨</act:name>
+  <act:id type="new">52c59dac947098d11ca9a43d75714e9a</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×•×¦××•×ª ×©×›×¨</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×•××¨ ×•×ž×©×œ×•×—×™×</act:name>
+  <act:id type="new">d4340e561ccc64867a80ccefa6cc3c7b</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×“×•××¨ ×•×ž×©×œ×•×—×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×¤×•×¡</act:name>
+  <act:id type="new">cce243036ee8c7e8036248a60b0b6eac</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×“×¤×•×¡</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×™×¨×•×ª×™× ×ž×§×¦×•×¢×™×™×</act:name>
+  <act:id type="new">fbc12ded14b9dbc5119f2bdb288229eb</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×™×¨×•×ª×™× ×ž×§×¦×•×¢×™×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”× ×”×œ×ª ×—×©×‘×•× ×•×ª ×•×‘×™×§×•×¨×ª</act:name>
+  <act:id type="new">f2fdacb032cbda092220d6b9bf78cdef</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”× ×”×œ×ª ×—×©×‘×•× ×•×ª ×•×‘×§×•×¨×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">fbc12ded14b9dbc5119f2bdb288229eb</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×©×¤×˜×™×•×ª</act:name>
+  <act:id type="new">ef0c1ba6fc2b99a3256091255982773c</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×©×¤×˜×™×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">fbc12ded14b9dbc5119f2bdb288229eb</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×›×™×¨×•×ª</act:name>
+  <act:id type="new">28fd22eec8e1c7185493720b7f3d6cd0</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×›×™×¨×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×™×§×•× ×™×</act:name>
+  <act:id type="new">f2145496f238b9002344ca78216bc91c</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ª×™×§×•× ×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××—×–×§×ª ×ž×‘× ×”</act:name>
+  <act:id type="new">861eaeafb9e9bf855943a8afb753fcc6</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××—×–×§×ª ×ž×‘× ×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f2145496f238b9002344ca78216bc91c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××—×–×§×ª ×ž×—×©×•×‘</act:name>
+  <act:id type="new">2dc1fc6c60662751a6eae28e0a81bb22</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××—×–×§×ª ×ž×—×©×•×‘</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f2145496f238b9002344ca78216bc91c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××—×–×§×ª ×¦×™×•×“</act:name>
+  <act:id type="new">b340710eb5dc97bc4c23201beffae5f2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××—×–×§×ª ×¦×™×•×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f2145496f238b9002344ca78216bc91c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª × ×™×§×™×•×Ÿ</act:name>
+  <act:id type="new">7943d40413854ff4237d88631cdcb4ef</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×•×¦××•×ª × ×™×§×™×•×Ÿ</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">f2145496f238b9002344ca78216bc91c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™×</act:name>
+  <act:id type="new">30bdea8690c89621731f925c8b3c766a</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×™×¡×™×</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×ž×¢×¡×™×§×™×</act:name>
+  <act:id type="new">e3dc372ffb7a2fc5c3c7f0c1450206b2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ×‘×¨×™××•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×œ××•×ž×™ ×ž×¢×‘×™×“</act:name>
+  <act:id type="new">acb82f26123c80767738a211dd63b7a4</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×‘×˜×•×— ×œ××•×ž×™ ×ž×¢×‘×™×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×‘×¨×™××•×ª ×ž×¢×‘×™×“</act:name>
+  <act:id type="new">92748ccfdd7f8b0603980d8e3849ee30</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ×‘×¨×™××•×ª ×ž×¢×‘×™×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×”×›× ×¡×”</act:name>
+  <act:id type="new">cab57e6c35ec19c6b18b4d554fe4857b</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ×”×›× ×¡×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨× ×•× ×”</act:name>
+  <act:id type="new">821b7c3e3d6d6f8cb9b9762de573b878</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××¨× ×•× ×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ××—×¨</act:name>
+  <act:id type="new">7620db1268874ab746b53bd42280ef90</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ××—×¨</act:description>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×¨×•×•×— ×”×•×Ÿ</act:name>
+  <act:id type="new">4708c984cf3b2bf64e5b1c313dfeca52</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ×¨×•×•×— ×”×•×Ÿ</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×©×‘×—</act:name>
+  <act:id type="new">03ed8cb60b8b12420e49350d93886132</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×¡ ×©×‘×—</act:description>
+  <act:parent type="new">30bdea8690c89621731f925c8b3c766a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×¡×™×¢×•×ª ×¢×™×¡×§×™×•×ª</act:name>
+  <act:id type="new">22c71db3296e8e0d8fe4572bf8f63cb8</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>× ×¡×™×¢×•×ª ×¢×™×¡×§×™×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨×•×—</act:name>
+  <act:id type="new">f959d8df29a540e09d9fd8252dd5a03d</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××¨×•×—</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">22c71db3296e8e0d8fe4572bf8f63cb8</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨×•×—×•×ª</act:name>
+  <act:id type="new">b50b84a7f3285f63e00f662bc0281a43</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××¨×•×—×•×ª</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">22c71db3296e8e0d8fe4572bf8f63cb8</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×¡×™×¢×”</act:name>
+  <act:id type="new">24ea69f91cb658f3d72c31483917f844</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>× ×¡×™×¢×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">22c71db3296e8e0d8fe4572bf8f63cb8</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×™×¨×•×ª×™× ×ž×§×•×ž×™×™×</act:name>
+  <act:id type="new">b615fad5f752ab26809e3f1c0e788dd1</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×©×™×¨×•×ª×™× ×ž×§×•×ž×™×™×</act:description>
+  <act:parent type="new">1eca26f16967a1627df155e49b44a609</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×‘×œ×™×</act:name>
+  <act:id type="new">6e3824bff6b9cf23a6d36a63ac5328b2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×›×‘×œ×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×˜×œ×¤×•×Ÿ × ×™×™×“</act:name>
+  <act:id type="new">57e08a9bd565efd6eff07fd11fb5b6b9</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×˜×œ×¤×•×Ÿ × ×™×™×“</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×©×ž×œ</act:name>
+  <act:id type="new">e5378ddb536611d96ea62c9b4623f3ef</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×—×©×ž×œ</act:description>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¤×™× ×•×™ ××©×¤×”</act:name>
+  <act:id type="new">bbf9f26770d63a891f95a342925d8185</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¤×™× ×•×™ ××©×¤×”</act:description>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×’×–</act:name>
+  <act:id type="new">52df875a1c9753d1ac9c892a749dcd4e</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×’×–</act:description>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××™× ×˜×¨× ×˜</act:name>
+  <act:id type="new">1cac96739edb6d233ac70bae620cdfa2</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>××™× ×˜×¨× ×˜</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×˜×œ×¤×•×Ÿ</act:name>
+  <act:id type="new">f3c66e8b8f0448c3864c2cc0b49d9832</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×˜×œ×¤×•×Ÿ</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×™×</act:name>
+  <act:id type="new">7e31406974a0f966667e073cdf53c53c</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×ž×™×™×</act:description>
+  <act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×Ÿ</act:name>
+  <act:id type="new">87e02e757b32b3059652cfe09fe9ae00</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">a19c505d4b414bf3f5b574104959f534</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×™×ª×¨×•×ª ×¤×ª×™×—×”</act:description>
+  <act:parent type="new">87e02e757b32b3059652cfe09fe9ae00</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×•×•×—×™× ×ž×™×•×¢×“×™×</act:name>
+  <act:id type="new">1b44c21b9b8a7c6181d85f5551cca79d</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¨×•×•×—×™× ×ž×™×•×¢×“×™×</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">false</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string"></slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">87e02e757b32b3059652cfe09fe9ae00</act:parent>
+</gnc:account>
+
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_carloan.gnucash-xea b/data/accounts/he/acctchrt_carloan.gnucash-xea
new file mode 100644
index 000000000..b18be05f1
--- /dev/null
+++ b/data/accounts/he/acctchrt_carloan.gnucash-xea
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">023e2343114b3d695feaeb96904e0da6</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª</act:description>
+  <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</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">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××ª ×¨×›×‘</act:description>
+  <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">acacdcb998e45fb741766622e8542f0b</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">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">9e8495e80ebfb762089be917dff7ab72</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">acacdcb998e45fb741766622e8542f0b</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <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>
+  </act:commodity>
+  <act:description>×¨×™×‘×™×ª ×¢×œ ×”×œ×•×•××ª ×¨×›×‘</act:description>
+  <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_cdmoneymkt.gnucash-xea b/data/accounts/he/acctchrt_cdmoneymkt.gnucash-xea
new file mode 100644
index 000000000..399b4b9dc
--- /dev/null
+++ b/data/accounts/he/acctchrt_cdmoneymkt.gnucash-xea
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">7b1a39efc6234d1db148baa722c9471e</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">1880e89ec9fe82622b8648df481dd2b7</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ×©×•×˜×£</act:description>
+  <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</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">c1620f9c3082e33d8fd559e17f90a122</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×—×™×¡×›×•×Ÿ ×‘×‘× ×§</act:description>
+  <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×•×§ ×”×”×•×Ÿ</act:name>
+  <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×©×•×§ ×”×”×•×Ÿ</act:description>
+  <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</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">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">fd131cae797d1fb83c2e2bf57254eca5</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">4b3e36f325569b80efc7d3331bdf851b</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×—×¡×›×•× ×•×ª</act:name>
+  <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</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">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×©×•×§ ×”×”×•×Ÿ</act:name>
+  <act:id type="new">dc537946f39e84ccef7ce38f016249af</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">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_checkbook.gnucash-xea b/data/accounts/he/acctchrt_checkbook.gnucash-xea
new file mode 100644
index 000000000..ea74c8188
--- /dev/null
+++ b/data/accounts/he/acctchrt_checkbook.gnucash-xea
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">bde24bbbe01829aff3dac8d038e174cc</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">d90864ec1d660176244b05a0e43e621a</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×¨×›×•×© ×©×•×˜×£</act:description>
+  <act:parent type="new">bde24bbbe01829aff3dac8d038e174cc</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">ab2dc28552256b8d1ef4fdea4ba45717</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×—×©×‘×•×Ÿ ×¢×•×‘×¨ ×•×©×‘</act:description>
+  <act:parent type="new">d90864ec1d660176244b05a0e43e621a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">e96c0691c219f5f55590e20fb9a3309b</act:id>
+  <act:type>INCOME</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×›× ×¡×•×ª</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">3b95fbbcc06ef20d61aa082b84938287</act:id>
+  <act:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×”×•×¦××•×ª</act:description>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×Ÿ</act:name>
+  <act:id type="new">b8b72887da1adf889f171923d23efbdd</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <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">bdb4dd9be2b98f03a0b400036452232c</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:commodity-scu>100</act:commodity-scu>
+  <act:description>×™×ª×¨×ª ×¤×ª×™×—×”</act:description>
+  <act:parent type="new">b8b72887da1adf889f171923d23efbdd</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_childcare.gnucash-xea b/data/accounts/he/acctchrt_childcare.gnucash-xea
new file mode 100644
index 000000000..98f7af090
--- /dev/null
+++ b/data/accounts/he/acctchrt_childcare.gnucash-xea
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">ee8238ee2c2ce590160761df09b99b72</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">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">8999739a6bfc46088a3ea5ec45e5f8a4</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">ee8238ee2c2ce590160761df09b99b72</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_common.gnucash-xea b/data/accounts/he/acctchrt_common.gnucash-xea
new file mode 100644
index 000000000..396442be6
--- /dev/null
+++ b/data/accounts/he/acctchrt_common.gnucash-xea
@@ -0,0 +1,782 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+×—×©×‘×•× ×•×ª × ×¤×•×¦×™×
+</gnc-act:title>
+<gnc-act:short-description>
+  ×ª×¨×©×™× ×—×©×‘×•× ×•×ª ×‘×¡×™×¡×™× ×¤×•×¥ ×‘×™×•×ª×¨ ×‘×©×™×ž×•×© ×¤×¨×˜×™
+</gnc-act:short-description>
+<gnc-act:long-description>
+  ×ª×•×›×œ×• ×œ×‘×—×•×¨ ×‘×ª×¨×©×™× ×—×©×‘×•× ×•×ª ×–×” ×œ×ž×¢×§×‘ ×•× ×™×”×•×œ ×—×©×‘×•× ××™ ×¤×¨×˜×™, ×œ× ×¢×™×¡×§×™. ×”×ª×¨×©×™× ×›×•×œ×œ ××ª ×›×œ ×¡×•×’×™ ×”×—×©×‘×•× ×•×ª ×”× ×¤×•×¦×™× ×”× ×“×¨×©×™× ×œ×©×¤ ×›×š (×”×›× ×¡×•×ª, ×”×•×¦××•×ª, ×›×¨×˜×™×¡×™ ××©×¨××™, ×”×ž×—××•×ª, ×”×•×¦××•×ª ×ž×—×™×™×” ×•×¢×•×“).
+</gnc-act:long-description>
+<gnc-act:start-selected>1</gnc-act:start-selected>
+
+<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">98f262dfab9a2b99ac42919dcf58d304</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">a1dd5f225156f110689c204fefded0ab</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ×©×•×˜×£</act:description>
+  <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</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">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
+  <act:type>CASH</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">efc3caac2619666c53e6e27f02d5e716</act:id>
+  <act:type>CREDIT</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×›×¨×˜×™×¡ ××©×¨××™</act:description>
+  <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">a7ab23dd2d41616042034d5a012a0850</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">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">59b72cd943a2ca6f077748bba9a942cd</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">1adcf2c65d7a66f32144ccd9ce4f438f</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">c47361e40d9478ec11758097e64d693c</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">73481e2da7461fc34e7003b7ec560bdf</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">c47361e40d9478ec11758097e64d693c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ××—×¨×ª</act:name>
+  <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</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">c47361e40d9478ec11758097e64d693c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×—×™×¡×›×•×Ÿ</act:name>
+  <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</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">c47361e40d9478ec11758097e64d693c</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">49525ad0fb4ced06b9874d365d53f505</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">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>
+  </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">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: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">2ff007a389bd23d8970afeba2d58c9a8</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">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>USD</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>USD</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>USD</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">fb6c8e25a50737e70fffde432a2355ee</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">36479bbc17680f4b9663a9842736153f</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">a1393344fb199f08f751ac3154694e87</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">ec8eec3d46c69aa861fda836e11346c0</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">c27a040a73eac2688d85d29b5b5309c8</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">fc4390b6214ad1576c5ffffc2b3c268c</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">0a59a3347e4ff02b862de41ef59d7351</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">5b5ac050529b0f553752babe4a6a35d2</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">0ebd1d5f40d9e9e8bb1a4bf539650dd1</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">4570ea8f4ac5cbd7d8927c905f0978ae</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">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×•×¤×©</act:name>
+  <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</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">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×¡×™×¢×”</act:name>
+  <act:id type="new">def0eac939dbd668f503d84860de8d6e</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">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <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>
+  </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">83bc2bd915ab6b74c7107b55f8783523</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">89f6400a94cd87fea0b056faf6ab7744</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">5bda5ff833bc395dc1b00f95c66ce555</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">cd72695526906a15ba1a1d9a7680b8e7</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">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <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>
+  </act:commodity>
+  <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: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">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×‘×™×¡×”/× ×™×§×•×™ ×™×‘×©</act:name>
+  <act:id type="new">1006551b2458631dfc8507b7451c9631</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">62752930dd1b2b4c90c6d198bd2ff33f</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">759deef82e73587bf48a7dd76aa6abe8</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">2170a1a631cc3b6fc32813fa49a12f77</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">1d9d7265e25c6c84dda514d2e8899e87</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">64aa760163c7768518e49a104d1c171f</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">0336712690d36bcb02e0ce59b5d7653b</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">e2b34f49d4cf916cf4d45525e1e7319d</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">2c53a8a0c8b36f7de3f4052653886c2b</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">090a786357463ec7fbee8066cb999097</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">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×‘×¨×™××•×ª</act:name>
+  <act:id type="new">0785932c5de43e814659420762c9b577</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">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+</gnc:account>
+<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>
+  </act:commodity>
+  <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: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">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨× ×•× ×”</act:name>
+  <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</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">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×¨×•×ª×™× ×ž×§×•×ž×™×™×</act:name>
+  <act:id type="new">57635fa5f71dee8ffc207c277250e773</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">2fe462e202e2daffd845359b08a7eefe</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">57635fa5f71dee8ffc207c277250e773</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××™×¡×•×£ ××©×¤×”</act:name>
+  <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</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">57635fa5f71dee8ffc207c277250e773</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×’×–</act:name>
+  <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</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">57635fa5f71dee8ffc207c277250e773</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×™×</act:name>
+  <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</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">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:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">a0a622a30410f75eba35d2875a843da8</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×™×ª×¨×•×ª ×¤×ª×™×—×”</act:description>
+  <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
+</gnc:account>
+
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_eduloan.gnucash-xea b/data/accounts/he/acctchrt_eduloan.gnucash-xea
new file mode 100644
index 000000000..f1a31e52b
--- /dev/null
+++ b/data/accounts/he/acctchrt_eduloan.gnucash-xea
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">c3219e37044b0531d66a7b64433b026d</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª</act:description>
+  <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</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">ddeba367199bd025e00420a19d6f9ae4</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××ª ×œ×™×ž×•×“×™×</act:description>
+  <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">fdbf47b39f70e8818f325eee7931039a</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">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">1cfcd30ea97b954ffb550ab87d561033</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">fdbf47b39f70e8818f325eee7931039a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×¢×œ ×”×œ×•×•××ª ×œ×™×ž×•×“×™×</act:name>
+  <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</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">1cfcd30ea97b954ffb550ab87d561033</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_fixedassets.gnucash-xea b/data/accounts/he/acctchrt_fixedassets.gnucash-xea
new file mode 100644
index 000000000..3414aa81d
--- /dev/null
+++ b/data/accounts/he/acctchrt_fixedassets.gnucash-xea
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">64b6276c060185131cecbd1ac6218440</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">9b171f77000bf68dd1ebbaf58336656d</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ×§×‘×•×¢</act:description>
+  <act:parent type="new">64b6276c060185131cecbd1ac6218440</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">9205ad6b6482903e5a696602d491c8f5</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×‘×™×ª</act:description>
+  <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×›×•×© ××—×¨</act:name>
+  <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ××—×¨</act:description>
+  <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×›×‘</act:name>
+  <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×‘</act:description>
+  <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_full.gnucash-xea b/data/accounts/he/acctchrt_full.gnucash-xea
new file mode 100644
index 000000000..9f3389296
--- /dev/null
+++ b/data/accounts/he/acctchrt_full.gnucash-xea
@@ -0,0 +1,1395 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+
+<gnc-act:title>
+  ×ª×¨×©×™× ×—×©×‘×•× ×•×ª ×ž×œ×
+</gnc-act:title>
+<gnc-act:short-description>
+  ×ª×¨×©×™× ×¢×¥ ×—×©×‘×•× ×•×ª ×ž×œ× ×”×ž×›×™×œ ××ª ×›×œ ×—×©×‘×•× ×•×ª ×‘×¨×™×¨×ª ×”×ž×—×“×œ.
+</gnc-act:short-description>
+<gnc-act:exclude-from-select-all>1</gnc-act:exclude-from-select-all>
+
+<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">c942789c77cfdd65bc6e4c12900f0805</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">f23dcf070835b376a95a7a06dbb62e59</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ×©×•×˜×£</act:description>
+  <act:parent type="new">c942789c77cfdd65bc6e4c12900f0805</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">e2f05a66ad8fb10a4f4d2d1ecdc6a13d</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×‘× ×§</act:description>
+  <act:parent type="new">f23dcf070835b376a95a7a06dbb62e59</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¢×•×‘×¨ ×•×©×‘</act:name>
+  <act:id type="new">a58419050d3b82f7f156658a98929df2</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¢×•×‘×¨ ×•×©×‘</act:description>
+  <act:parent type="new">f23dcf070835b376a95a7a06dbb62e59</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×•×§ ×”×”×•×Ÿ</act:name>
+  <act:id type="new">fc68a65077344e22b08d805ddcbf4dc8</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×©×•×§ ×”×”×•×Ÿ</act:description>
+  <act:parent type="new">f23dcf070835b376a95a7a06dbb62e59</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×™×¡×›×•×Ÿ</act:name>
+  <act:id type="new">bd6088ea984f27470c8ef4b8fc0826c1</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×—×™×¡×›×•×Ÿ</act:description>
+  <act:parent type="new">f23dcf070835b376a95a7a06dbb62e59</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×–×•×ž× ×™×</act:name>
+  <act:id type="new">d8232291d80c3d558e51d1e08cc3e85d</act:id>
+  <act:type>CASH</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž×–×•×ž× ×™×</act:description>
+  <act:parent type="new">f23dcf070835b376a95a7a06dbb62e59</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×›×•×© ×§×‘×•×¢</act:name>
+  <act:id type="new">c188686b29b9104da292aed8c2ca8541</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ×§×‘×•×¢</act:description>
+  <act:parent type="new">c942789c77cfdd65bc6e4c12900f0805</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">1d81c657af6cce36422ce3d7eb782bfc</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž×‘× ×”</act:description>
+  <act:parent type="new">c188686b29b9104da292aed8c2ca8541</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×›×•×© ××—×¨</act:name>
+  <act:id type="new">b7ac61cf72bc19c6b3917db1063908c6</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¨×›×•×© ××—×¨</act:description>
+  <act:parent type="new">c188686b29b9104da292aed8c2ca8541</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×œ×™ ×¨×›×‘</act:name>
+  <act:id type="new">71b413a7042e74974115333fd3d6f496</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×›×œ×™ ×¨×›×‘</act:description>
+  <act:parent type="new">c188686b29b9104da292aed8c2ca8541</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×©×§×¢×•×ª</act:name>
+  <act:id type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×©×§×¢×•×ª</act:description>
+  <act:parent type="new">c942789c77cfdd65bc6e4c12900f0805</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">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>× ×™×¨×•×ª ×¢×¨×š</act:description>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">7e0a0149682cc309278987426b5f9b82</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">4599087f4755245fbc052ec425c0094b</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">00710d6bd400e580c7e4f3d0795ef2ab</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">d8e24554e11c296b79b33953cba093de</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª×ª</act:description>
+  <act:parent type="new">c7ba76a2c51c691ecb4e6c80fcaa71f9</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨×Ÿ ×¤× ×¡×™×”</act:name>
+  <act:id type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨×Ÿ ×¤× ×¡×™×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string">×‘×˜×•×—×™ ×ž× ×”×œ×™×, ×§×•×¤×•×ª ×’×ž×œ ×•×ª×•×›× ×™×•×ª ×¤× ×¡×™×” ××—×¨×•×ª</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">4c272ebf68c058a45dde6be718ad9321</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">8aa76ecd4acf6b32280711f198787e4f</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">00c1dd188a5a3ffe26baf4afbe358adc</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">f3e62c6cf53adb5637b765b45b8df6c3</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">82ec8dc2b06e06eea619fd2e3aa79781</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨×Ÿ ×¤× ×¡×™×” ×‘×Ÿ/×‘×ª ×–×•×’</act:name>
+  <act:id type="new">eacb6de7f8896665d150d7dcb0a0b521</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨×Ÿ ×¤× ×¡×™×” ×‘×Ÿ/×‘×ª ×–×•×’</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>notes</slot:key>
+      <slot:value type="string">IRA, 401(k), or other retirement</slot:value>
+    </slot>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">aefb6c2cb4fe8ef354f4aaa2d8a6aac6</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž× ×™×•×ª</act:name>
+  <act:id type="new">bebd94871a7e14592cae393381e6f733</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž× ×™×•×ª</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">255ac00eae374e6893a934f5094d4d90</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">217ffae020de3df2671b4c247035d9df</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">eacb6de7f8896665d150d7dcb0a0b521</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×˜×‘×¢ ×—×•×¥</act:name>
+  <act:id type="new">66641bfe13094125067d5cb9e0bbddf0</act:id>
+  <act:type>CURRENCY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>DEM</cmdty:id>
+  </act:commodity>
+  <act:description>×ž×˜×‘×¢ ×—×•×¥</act:description>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×ª×—×™×‘×•×™×•×ª</act:name>
+  <act:id type="new">eeb68231aa8330bb6e3a747ffd94c07f</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">ae4c4552746eed9927cee195e7965dd8</act:id>
+  <act:type>CREDIT</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×›×¨×˜×™×¡ ××©×¨××™</act:description>
+  <act:parent type="new">eeb68231aa8330bb6e3a747ffd94c07f</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">4c95c4842d41f421c3e715f60eca8cce</act:id>
+  <act:type>CREDIT</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×• ××©×¨××™</act:description>
+  <act:parent type="new">eeb68231aa8330bb6e3a747ffd94c07f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×œ×•×•××•×ª</act:name>
+  <act:id type="new">c24e85723783d9ec27d9042c61b1673e</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª</act:description>
+  <act:parent type="new">eeb68231aa8330bb6e3a747ffd94c07f</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">44b1db96fbb3582be7df3cb69b280d98</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××ª ×©×›×¨ ×œ×ž×•×“</act:description>
+  <act:parent type="new">c24e85723783d9ec27d9042c61b1673e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×©×›× ×ª×</act:name>
+  <act:id type="new">f8d2f4753875905bf13f40495f51d382</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ž×©×›× ×ª×</act:description>
+  <act:parent type="new">c24e85723783d9ec27d9042c61b1673e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×œ×•×•××•×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">f1f25c96e2e452924c1707d1368e235b</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª ××—×¨×•×ª</act:description>
+  <act:parent type="new">c24e85723783d9ec27d9042c61b1673e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×œ×•×•××ª ×›×œ×™ ×¨×›×‘</act:name>
+  <act:id type="new">8e5190568ac6f8d96b0162e80d649dea</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××ª ×›×œ×™ ×¨×›×‘</act:description>
+  <act:parent type="new">c24e85723783d9ec27d9042c61b1673e</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª</act:name>
+  <act:id type="new">dcf25b179583108b12c1c36f044f2bf7</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">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">db19175a8749bb90e5d4a535db7aa509</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ×ž×“×™×‘×™×“× ×“</act:name>
+  <act:id type="new">f230ee8a41e285ff4b9a02c7a7d1255c</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×ª× ×•×ª ×©× ×ª×§×‘×œ×•</act:name>
+  <act:id type="new">9bb39b906c8797a8a9302087c80a75a3</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ×¨×™×‘×™×ª</act:name>
+  <act:id type="new">0b849fdbc4a52072e7323a86ec6e56d0</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž××’"×—</act:name>
+  <act:id type="new">26528cbd37abdfa623eb237a78eaeb28</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×™×ª×¨×ª ×–×›×•×ª ×‘×‘× ×§</act:name>
+  <act:id type="new">87d975472429aa388923d5674db26e10</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×”×œ×•×•××•×ª ×©× ×ª× ×•</act:name>
+  <act:id type="new">8e12304ec75b0562e8e7e5f1d3ef3f87</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×ž× ×™×•×ª</act:name>
+  <act:id type="new">170912c87f795e4715d22dff03ee68b7</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ×¨×™×‘×™×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">e52426c9cd9b0366a900e617b430d743</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×ž×ª×•×›× ×™×•×ª ×—×™×¡×›×•×Ÿ</act:name>
+  <act:id type="new">236e074cb18481c1c29018ddde5611f2</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">0b849fdbc4a52072e7323a86ec6e56d0</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×›× ×¡×•×ª ××—×¨×•×ª</act:name>
+  <act:id type="new">ba7f00e1972eead75456d0cb492cc7f0</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×©×›×•×¨×ª</act:name>
+  <act:id type="new">512c7af596fe774137b66e3533c8f055</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×©×›×•×¨×ª ×‘×Ÿ/×‘×ª ×–×•×’</act:name>
+  <act:id type="new">ba57742bca4aa6d9d5978e191601a3eb</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">dcf25b179583108b12c1c36f044f2bf7</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">d971e6172c344b6ce569f1af76b5dce1</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">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">ab7be937a05748c1be3d9ef1785f4519</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×¨×‘</act:name>
+  <act:id type="new">ad1b57f1fc9c02566ba67fc8c371f461</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¢×ž×œ×•×ª</act:name>
+  <act:id type="new">f812e775ecd98d235dffb3ebd83c4b3b</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">ad1b57f1fc9c02566ba67fc8c371f461</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×œ×§</act:name>
+  <act:id type="new">a4d661a2ba6410a74e4c70128bb275ba</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">ad1b57f1fc9c02566ba67fc8c371f461</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—× ×™×”</act:name>
+  <act:id type="new">a4538c6a7aa7f6020b98e733b7d5dc40</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">ad1b57f1fc9c02566ba67fc8c371f461</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×™×§×•× ×™× ×•××—×–×§×”</act:name>
+  <act:id type="new">f70be35deecc0a3984cbd7ce2e4c77c5</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">ad1b57f1fc9c02566ba67fc8c371f461</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¢×ž×œ×•×ª ×‘× ×§</act:name>
+  <act:id type="new">feab2e317232f98a5ebc859a8b4ee906</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¡×¤×¨×•×ª</act:name>
+  <act:id type="new">f93635e6a5f1ef83d9d54dc8edea3de7</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×‘×œ×™×</act:name>
+  <act:id type="new">509b8795a9e5e0cbd634e5247b4188a9</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¨×•×ž×•×ª</act:name>
+  <act:id type="new">5c0c0e895a39b6a0d953d28f701fc8e6</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×˜×™×¤×•×œ ×‘×¦××¦××™×</act:name>
+  <act:id type="new">f9b8ecd89294fba3e3a6af75722568b3</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×’×•×“</act:name>
+  <act:id type="new">245f0820b7733c540cbef67a891e270c</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¢×ž×œ×•×ª</act:name>
+  <act:id type="new">0bd7305ca93854747f81a62b39725947</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×—×©×•×‘</act:name>
+  <act:id type="new">58bef76d9de74e726019590a8b666fd8</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡×¢×“×•×ª</act:name>
+  <act:id type="new">36a0ecee5cdf0147988e75b440b4fc22</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×™× ×•×š</act:name>
+  <act:id type="new">bd907e7b878af870e05595df89a7ed70</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨×•×—</act:name>
+  <act:id type="new">f8194ec13425c8d3adb62a87e48dbe42</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¤× ××™/×¡×¨×˜×™×</act:name>
+  <act:id type="new">d96f97bf73335793d3746e8d049d9403</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">f8194ec13425c8d3adb62a87e48dbe42</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×•×¤×©</act:name>
+  <act:id type="new">b4b6cfe725a71b5aa8878679e4487ecb</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">f8194ec13425c8d3adb62a87e48dbe42</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×¡×™×¢×”</act:name>
+  <act:id type="new">a6713e6f8776c9450256e144d95dc111</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">f8194ec13425c8d3adb62a87e48dbe42</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×ª× ×•×ª</act:name>
+  <act:id type="new">acebcd1a292f0686f390aaaa9264a850</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×–×•×Ÿ ×•×ž×¦×¨×›×™×</act:name>
+  <act:id type="new">c1c9fdbb40055c8942653c92b6d09676</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×—×‘×™×‘×™×</act:name>
+  <act:id type="new">58b0de20ba38fad88958e31cf59e3f68</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××—×–×§×ª ×ž×§×•×</act:name>
+  <act:id type="new">0e10decd3e859abaaa133be5ba907c08</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×—</act:name>
+  <act:id type="new">165046096e7e0979a0470bfe28de4cf3</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×¨×›×‘</act:name>
+  <act:id type="new">ecfb7eba411756d5562027255f948362</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">165046096e7e0979a0470bfe28de4cf3</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×‘×¨×™××•×ª</act:name>
+  <act:id type="new">4879a1e9f1046516fc9c96ab9e7d135b</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">165046096e7e0979a0470bfe28de4cf3</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×ž×‘× ×”</act:name>
+  <act:id type="new">af0037a765c4c400161a19900e791969</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">165046096e7e0979a0470bfe28de4cf3</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×—×™×™×</act:name>
+  <act:id type="new">f849aa8e2df7241dd4bb30e9ff79b982</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">165046096e7e0979a0470bfe28de4cf3</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×™×˜×•×— ×ª×›×•×œ×”</act:name>
+  <act:id type="new">3e2212f779cf5feb6ecdf210a1f27c50</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">165046096e7e0979a0470bfe28de4cf3</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª</act:name>
+  <act:id type="new">cb8676e3c31dfda73936ca3d3ebcbdfc</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×¢×œ ×”×œ×•×•××ª ×©×›×¨ ×œ×™×ž×•×“</act:name>
+  <act:id type="new">3b54390a95a8fb5ad0830765f0db7bbf</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">cb8676e3c31dfda73936ca3d3ebcbdfc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ×¢×œ ×ž×©×›× ×ª×</act:name>
+  <act:id type="new">5314f613166cf952aa83086ceb31858b</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">cb8676e3c31dfda73936ca3d3ebcbdfc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×™×ª ××—×¨×ª</act:name>
+  <act:id type="new">a026778e8671ff552fc1db361c827bd3</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">cb8676e3c31dfda73936ca3d3ebcbdfc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¨×™×‘×ª ×¢×œ ×”×œ×•×•××ª ×¨×›×‘</act:name>
+  <act:id type="new">c410f2c057c1b219b4ea9ebf90f34492</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">cb8676e3c31dfda73936ca3d3ebcbdfc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×›×‘×™×¡×”/× ×™×§×•×™ ×™×‘×©</act:name>
+  <act:id type="new">db0be14af195878c6ee87346344c7aac</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª ×¨×¤×•××™×•×ª</act:name>
+  <act:id type="new">cf091aca54380ecbf2d4bc3d88f37a00</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×•× ×•×ª</act:name>
+  <act:id type="new">31f399cfc9289ce07105dbf0ebfd725b</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×¨×•×ª×™× ×ž×§×•×•× ×™×</act:name>
+  <act:id type="new">7dd178de8586033654a06b98bee7eb7b</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×˜×œ×¤×•×Ÿ</act:name>
+  <act:id type="new">a2657d9df178ff47fb608128838c3562</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×—×‘×•×¨×” ×¦×™×‘×•×¨×™×ª</act:name>
+  <act:id type="new">e8fd2b3d711c9b8eff7b119cedf5bf04</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×›×™×¨×•×ª</act:name>
+  <act:id type="new">d52369b08c150d14c894c32ebf758e97</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×“×ž×™ ×ž× ×•×™</act:name>
+  <act:id type="new">ea59a2f59d6049cc7cb4d0becef15a13</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×•×ž×¨×™ × ×™×§×•×™</act:name>
+  <act:id type="new">690ddda611710f6e4afefcfb9b83d5f5</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™×</act:name>
+  <act:id type="new">c0ad45e7b335ee715b26ee11457da5cc</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×”×›× ×¡×”</act:name>
+  <act:id type="new">fb15d987b277d68e960989397b82c903</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×‘×¨×™××•×ª</act:name>
+  <act:id type="new">0517c53d7390b4a6fd3d4590fb9e5a37</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™× ××—×¨×™×</act:name>
+  <act:id type="new">e0cfe3e8b1d1578bdfa87b6ab93a65d8</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×¨×•×•×— ×”×•×Ÿ</act:name>
+  <act:id type="new">c51f0cacdcacf37a9f089fc5712e06e5</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×˜×•×— ×œ××•×ž×™</act:name>
+  <act:id type="new">6143875cd54c1d42b0eb5d8165424320</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨× ×•× ×”</act:name>
+  <act:id type="new">4d77f8743da33d910b119ab71d1d3de0</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">c0ad45e7b335ee715b26ee11457da5cc</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™× ×‘×Ÿ/×‘×ª ×–×•×’</act:name>
+  <act:id type="new">63427014f39c577ee7aaeac3603d3d1f</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×”×›× ×¡×”</act:name>
+  <act:id type="new">bed90f2f5a34174b1411af26d5a3be66</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">63427014f39c577ee7aaeac3603d3d1f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×‘×¨×™××•×ª</act:name>
+  <act:id type="new">d875462cb5d15112c2e803b03b8d1ab7</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">63427014f39c577ee7aaeac3603d3d1f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™× ××—×¨×™×</act:name>
+  <act:id type="new">1d9c9ea015bd54e5950c408c43d26814</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">63427014f39c577ee7aaeac3603d3d1f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×˜×•×— ×œ××•×ž×™</act:name>
+  <act:id type="new">92c0ce430b98ed01dbdff9c6f6ecbb74</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">63427014f39c577ee7aaeac3603d3d1f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××¨× ×•× ×”</act:name>
+  <act:id type="new">6d729d9b8356d9ee9af50b6dae4bcce9</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">63427014f39c577ee7aaeac3603d3d1f</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×¨×•×ª×™× ×ž×§×•×ž×™×™×</act:name>
+  <act:id type="new">7eecc2df800a0b8854343703d9cfae00</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">d971e6172c344b6ce569f1af76b5dce1</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×—×©×ž×œ</act:name>
+  <act:id type="new">141513d42098eb6692cf9473a8af1dc8</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">7eecc2df800a0b8854343703d9cfae00</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×¤×™× ×•×™ ××©×¤×”</act:name>
+  <act:id type="new">32e63639b9c11290ea1992ef495886d5</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">7eecc2df800a0b8854343703d9cfae00</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×’×–</act:name>
+  <act:id type="new">82576b22dca07135a0d0dc6b8c75bcae</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">7eecc2df800a0b8854343703d9cfae00</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×™×</act:name>
+  <act:id type="new">5fe26045f26b9054b5edf944d7e66f94</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">7eecc2df800a0b8854343703d9cfae00</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×Ÿ</act:name>
+  <act:id type="new">68d4074f91295062c0b773b4ae8de6bd</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">934f33a49a656d1813398f0e73bc3cd7</act:id>
+  <act:type>EQUITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×™×ª×¨×•×ª ×¤×ª×™×—×”</act:description>
+  <act:parent type="new">68d4074f91295062c0b773b4ae8de6bd</act:parent>
+</gnc:account>
+
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_homeloan.gnucash-xea b/data/accounts/he/acctchrt_homeloan.gnucash-xea
new file mode 100644
index 000000000..b63c9b2ca
--- /dev/null
+++ b/data/accounts/he/acctchrt_homeloan.gnucash-xea
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">6664763bd1ea41462cba5ef856d9c00c</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª</act:description>
+  <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</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">4df1b393c218d9047dd22d33d2737e83</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <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:type>EXPENSE</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">3dc58d8a51b5deaa22e0c65d81e90346</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">2f076f5ae073173a11d33420cd39fa4d</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <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>
+  </act:commodity>
+  <act:description>×¨×™×‘×™×ª ×¢×œ ×ž×©×›× ×ª×</act:description>
+  <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_homeown.gnucash-xea b/data/accounts/he/acctchrt_homeown.gnucash-xea
new file mode 100644
index 000000000..0a9fb440a
--- /dev/null
+++ b/data/accounts/he/acctchrt_homeown.gnucash-xea
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">84732f5fdd27b6463d75bf958e3a4b06</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: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">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>
+  </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">3b5909f31bda0e0f76149fd600e0cb1d</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">4677fe36914ebcf23758f3bf20686b4a</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™×</act:name>
+  <act:id type="new">a931b8ffe2917ff9a069333623da96ca</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">3994b8f5a6a8b2a0a48126fa955e03f7</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">a931b8ffe2917ff9a069333623da96ca</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_otherloan.gnucash-xea b/data/accounts/he/acctchrt_otherloan.gnucash-xea
new file mode 100644
index 000000000..a49fac921
--- /dev/null
+++ b/data/accounts/he/acctchrt_otherloan.gnucash-xea
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">b5624a9d1a1b797b87b815774faccfe4</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××•×ª</act:description>
+  <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</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">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
+  <act:type>LIABILITY</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×œ×•×•××” ××—×¨×ª</act:description>
+  <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×”×•×¦××•×ª</act:name>
+  <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</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: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">4a02c14e992ea79076837c164aa6fc8d</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">565e52a122e8acc9a67a36e61357e2ae</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <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>
+  </act:commodity>
+  <act:description>×¨×™×‘×™×ª ××—×¨×ª</act:description>
+  <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_renter.gnucash-xea b/data/accounts/he/acctchrt_renter.gnucash-xea
new file mode 100644
index 000000000..811926b04
--- /dev/null
+++ b/data/accounts/he/acctchrt_renter.gnucash-xea
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">9a2b4520f113372f4e576f5b6dc129c6</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: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">b79b231807a98cd562c46cf0454e9f25</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">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>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×©×›×¨ ×“×™×¨×”</act:name>
+  <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</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">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_retiremt.gnucash-xea b/data/accounts/he/acctchrt_retiremt.gnucash-xea
new file mode 100644
index 000000000..1296fdc66
--- /dev/null
+++ b/data/accounts/he/acctchrt_retiremt.gnucash-xea
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×©×§×¢×•×ª</act:description>
+  <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</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">4173f3047238f4b5595b11d6161b2f48</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¤×¨×™×©×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>×”×¢×¨×•×ª</slot:key>
+      <slot:value type="string">×‘×˜×‘×˜×•×— ×ž× ×”×œ×™×, ×§×•×¤×ª ×’×ž×œ, ×§×¨×Ÿ ×¤× ×¡×™×” ××• ××—×¨</slot:value>
+    </slot>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×™×¨×•×ª ×¢×¨×š</act:name>
+  <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>× ×™×™×¨×•×ª ×¢×¨×š</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_spouseinc.gnucash-xea b/data/accounts/he/acctchrt_spouseinc.gnucash-xea
new file mode 100644
index 000000000..759da7a10
--- /dev/null
+++ b/data/accounts/he/acctchrt_spouseinc.gnucash-xea
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">b4fadf6188d7f1ae7e7aa4fa27f5cc95</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: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">7c4495ff132d100b0aa339ce683200dd</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">b4fadf6188d7f1ae7e7aa4fa27f5cc95</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>
+  </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">3cd0ca7d6b0e5f44e4cde2851c3ff387</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">78df9cf06ee197272a695a4c3044f749</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">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×‘×¨×™××•×ª</act:name>
+  <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</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">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×™×¡×™× ××—×¨×™×</act:name>
+  <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</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">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×‘×˜×•×— ×œ××•×ž×™</act:name>
+  <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</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">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ž×¡ ×¨×•×•×— ×”×•×Ÿ</act:name>
+  <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</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">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
+</gnc:account>
+</gnc-account-example>
diff --git a/data/accounts/he/acctchrt_spouseretire.gnucash-xea b/data/accounts/he/acctchrt_spouseretire.gnucash-xea
new file mode 100644
index 000000000..9aaf5e584
--- /dev/null
+++ b/data/accounts/he/acctchrt_spouseretire.gnucash-xea
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<gnc-account-example 
+  xmlns="http://www.gnucash.org/XML/"
+  xmlns:act="http://www.gnucash.org/XML/act"
+  xmlns:addr="http://www.gnucash.org/XML/addr"
+  xmlns:bgt="http://www.gnucash.org/XML/bgt"
+  xmlns:billterm="http://www.gnucash.org/XML/billterm"
+  xmlns:book="http://www.gnucash.org/XML/book"
+  xmlns:bt-days="http://www.gnucash.org/XML/bt-days"
+  xmlns:bt-prox="http://www.gnucash.org/XML/bt-prox"
+  xmlns:cd="http://www.gnucash.org/XML/cd"
+  xmlns:cmdty="http://www.gnucash.org/XML/cmdty"
+  xmlns:cust="http://www.gnucash.org/XML/cust"
+  xmlns:employee="http://www.gnucash.org/XML/employee"
+  xmlns:entry="http://www.gnucash.org/XML/entry"
+  xmlns:fs="http://www.gnucash.org/XML/fs"
+  xmlns:gnc="http://www.gnucash.org/XML/gnc"
+  xmlns:gnc-act="http://www.gnucash.org/XML/gnc-act"
+  xmlns:invoice="http://www.gnucash.org/XML/invoice"
+  xmlns:job="http://www.gnucash.org/XML/job"
+  xmlns:lot="http://www.gnucash.org/XML/lot"
+  xmlns:order="http://www.gnucash.org/XML/order"
+  xmlns:owner="http://www.gnucash.org/XML/owner"
+  xmlns:price="http://www.gnucash.org/XML/price"
+  xmlns:recurrence="http://www.gnucash.org/XML/recurrence"
+  xmlns:slot="http://www.gnucash.org/XML/slot"
+  xmlns:split="http://www.gnucash.org/XML/split"
+  xmlns:sx="http://www.gnucash.org/XML/sx"
+  xmlns:taxtable="http://www.gnucash.org/XML/taxtable"
+  xmlns:trn="http://www.gnucash.org/XML/trn"
+  xmlns:ts="http://www.gnucash.org/XML/ts"
+  xmlns:tte="http://www.gnucash.org/XML/tte"
+  xmlns:vendor="http://www.gnucash.org/XML/vendor">
+    <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">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</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">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
+  <act:type>ASSET</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×”×©×§×¢×•×ª</act:description>
+  <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</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">4173f3047238f4b5595b11d6161b2f48</act:id>
+  <act:type>BANK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×¤×¨×™×©×”</act:description>
+  <act:slots>
+    <slot>
+      <slot:key>×”×¢×¨×•×ª</slot:key>
+      <slot:value type="string">×‘×˜×‘×˜×•×— ×ž× ×”×œ×™×, ×§×•×¤×ª ×’×ž×œ, ×§×¨×Ÿ ×¤× ×¡×™×” ××• ××—×¨</slot:value>
+    </slot>
+    <slot>
+      <slot:key>placeholder</slot:key>
+      <slot:value type="string">true</slot:value>
+    </slot>
+  </act:slots>
+  <act:parent type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>××’×¨×•×ª ×—×•×‘</act:name>
+  <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>××’×¨×•×ª ×—×•×‘</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>× ×™×¨×•×ª ×¢×¨×š</act:name>
+  <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
+  <act:type>STOCK</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>× ×™×™×¨×•×ª ×¢×¨×š</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×ª×¢×•×“×•×ª ×¡×œ</act:name>
+  <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×ª×¢×•×“×•×ª ×¡×œ</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+<gnc:account version="2.0.0">
+  <act:name>×§×¨× ×•×ª × ××ž× ×•×ª</act:name>
+  <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
+  <act:type>MUTUAL</act:type>
+  <act:commodity>
+    <cmdty:space>ISO4217</cmdty:space>
+    <cmdty:id>USD</cmdty:id>
+  </act:commodity>
+  <act:description>×§×¨× ×•×ª × ××ž× ×•×ª</act:description>
+  <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
+</gnc:account>
+</gnc-account-example>

commit e8543008c00493cbf80fb8897ce8c51f3184dfbe
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 17:21:32 2019 +0200

    Manpage generation tweaks
    
    - depend on gnc-vcs-info.h file directly instead of the gnc-vcs-info target
      The latter won't cause gnucash to update the manpage in case gnc-vcs-info.h changes,
      the former does.
    - use GNC_VCS_REV as version instead of the static VERSION parameter

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 79f3c9872..233dd64d8 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -55,10 +55,9 @@ file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
   DESTINATION ${DATADIR_BUILD}/gnucash)
 
 add_custom_command(OUTPUT gnucash.1
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in gnc-vcs-info
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in ${VCS_INFO_FILE}
   COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in
                            -D DST=gnucash.1
-                           -D VERSION=${VERSION}
                            -D VCS_INFO_FILE=${VCS_INFO_FILE}
                            -D DATADIR_BUILD=${DATADIR_BUILD}
                            -D SRC_DIR=${CMAKE_SOURCE_DIR}
diff --git a/doc/gnucash.1.in b/doc/gnucash.1.in
index bf56ee86e..505f85e5c 100644
--- a/doc/gnucash.1.in
+++ b/doc/gnucash.1.in
@@ -2,7 +2,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH GNUCASH 1 "@GNC_VCS_REV_DATE@" "Version @VERSION@" "GnuCash Manual Pages"
+.TH GNUCASH 1 "@GNC_VCS_REV_DATE@" "Version @GNC_VCS_REV@" "GnuCash Manual Pages"
 .SH NAME
 gnucash \- personal finance manager
 .SH SYNOPSIS

commit 7dc59950a59debfd78a3386ff77a99dfbece7522
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 16:32:56 2019 +0200

    Bug 797353 - Add copyright and release info in appdata file
    
    This also means the appdata file now requires preprocessing to set this info
    automatically.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c417bd1f8..d6ac0c334 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,14 @@ if (GNC_VCS_INFO_RESULT EQUAL 0)
   if (NOT GIT_FOUND)
     message(SEND_ERROR "Looks like we're building from version control, but can't find git executable. Please set GIT_EXECUTABLE.")
   endif()
+  set(VCS_INFO_BASE_DIR ${CMAKE_BINARY_DIR})
+else()
+  set(VCS_INFO_BASE_DIR ${CMAKE_SOURCE_DIR})
 endif()
+# The location of gnc-vcs-info.h depends on whether we build from VCS or not
+# And this file is needed in several other build rules, so we define its
+# location once here.
+set(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h)
 
 # Determine whether to generate the swig wrappers.
 # By default they will only be generated when building from a git worktree
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index deaebf2b1..bb3ddf2bb 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -9,6 +9,6 @@ endif(APPLE)
 
 
 set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in
-    configure-manpage.cmake git2version-info.cmake
+    configure-appdata.cmake configure-manpage.cmake git2version-info.cmake
     version-info2env.cmake
 )
diff --git a/cmake/configure-appdata.cmake b/cmake/configure-appdata.cmake
new file mode 100644
index 000000000..11cc7b765
--- /dev/null
+++ b/cmake/configure-appdata.cmake
@@ -0,0 +1,16 @@
+# Command to configure the gnucash appdata file
+# These commands are stored in a separate cmake file as they have to be
+# rerun depending on build conditions, not depending on cmake conditions
+# (such as did the version string change or not)
+#
+# The following environment variables are used and should be properly set
+# by the calling code:
+# - SRC_DIR (top level source code directory)
+# - SRC (full path to gnc-vcs-info.h.in)
+# - DST (full path to destination for gnc-vcs-info.h)
+# - VCS_INFO_FILE (full path to gnc-vcs-info.h - can be in source tree (release builds) or build tree (git builds))
+# - DATADIR_BUILD (path to applicication data directory, typically {CMAKE_BINARY_DIR}/share)
+
+include (${SRC_DIR}/cmake/version-info2env.cmake)
+versioninfo2env (${VCS_INFO_FILE})
+configure_file(${SRC} ${DST} )
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7e7f81294..79f3c9872 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -54,14 +54,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION  ${CMA
 file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
   DESTINATION ${DATADIR_BUILD}/gnucash)
 
-# ---
-if (BUILDING_FROM_VCS)
-  set(VCS_INFO_BASE_DIR ${CMAKE_BINARY_DIR})
-else()
-  set(VCS_INFO_BASE_DIR ${CMAKE_SOURCE_DIR})
-endif()
-set(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h)
-
 add_custom_command(OUTPUT gnucash.1
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in gnc-vcs-info
   COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in
diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt
index 970606c8b..6291f27c5 100644
--- a/gnucash/gnome/CMakeLists.txt
+++ b/gnucash/gnome/CMakeLists.txt
@@ -153,23 +153,30 @@ install(TARGETS gnc-gnome
 
 # No headers to install
 
-# FIXME: where does LC_ALL=C come from?
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
+DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in ${VCS_INFO_FILE}
+    COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+                             -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
+                             -D VCS_INFO_FILE=${VCS_INFO_FILE}
+                             -D SRC_DIR=${CMAKE_SOURCE_DIR}
+                             -P ${CMAKE_SOURCE_DIR}/cmake/configure-appdata.cmake)
 
 if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
     # Gettext is too old to be able to merge an appdata file.
     # Fall back to providing an unmerged (and hence untranslated) appdata file.
-    configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+    configure_file (${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
                     ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml COPYONLY)
 else()
+    # FIXME: where does LC_ALL=C come from?
     add_custom_command (
         OUTPUT gnucash.appdata.xml
         COMMAND ${CMAKE_COMMAND} -E env
             LC_ALL=C
             ${GETTEXT_MSGFMT_EXECUTABLE}
-                --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+                --xml --template ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in
                 -d ${CMAKE_SOURCE_DIR}/po
                 -o gnucash.appdata.xml
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.appdata.xml.in
+        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml.in gnc-vcs-info
     )
 endif()
 
diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
index 0f2dae42f..11e77b592 100644
--- a/gnucash/gnome/gnucash.appdata.xml.in
+++ b/gnucash/gnome/gnucash.appdata.xml.in
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright ${GNC_VCS_REV_YEAR}  Multiple Authors, see included AUTHORS file. -->
 <component>
   <id>org.gnucash.GnuCash</id>
   <name>GnuCash</name>
@@ -33,6 +34,10 @@
   <launchable type="desktop-id">gnucash.desktop</launchable>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
+  <releases>
+      <release date="${GNC_VCS_REV_DATE}" version="${GNC_VCS_REV}" />
+  </releases>
+
   <screenshots>
     <screenshot type="default">
       <image type="source" width="1049" height="590">https://www.gnucash.org/images/features/feature_accounts_lg.png</image>
diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
index 647b22041..3960cd7c4 100644
--- a/libgnucash/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -41,6 +41,16 @@ set(sysconfdir ${CMAKE_INSTALL_FULL_SYSCONFDIR})
 set(localedir "${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale")
 configure_file(gncla-dir.h.in gncla-dir.h)
 
+
+
+# ---
+if (BUILDING_FROM_VCS)
+  set(VCS_INFO_BASE_DIR ${CMAKE_BINARY_DIR})
+else()
+  set(VCS_INFO_BASE_DIR ${CMAKE_SOURCE_DIR})
+endif()
+set(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h CACHE STRING "path to gnc-vcs-dir")
+
 ### Create gnc-vcs-info.h
 # This can only be done when building from a vcs (git/svn/bzr/svk) working directory.
 # This file is shipped in the distribution tarball, so no need to generate it in that case anyway.
@@ -63,7 +73,7 @@ add_custom_target(gnc-vcs-info ALL
                              -P ${CMAKE_SOURCE_DIR}/cmake/git2version-info.cmake
 )
 else(BUILDING_FROM_VCS)
-  add_custom_target(gnc-vcs-info DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnc-vcs-info.h)
+  add_custom_target(gnc-vcs-info DEPENDS ${VCS_INFO_FILE})
 endif(BUILDING_FROM_VCS)
 dist_add_generated (${BUILDING_FROM_VCS} gnc-vcs-info.h)
 ### Compile library

commit c4a21bc9d4d05b16820396560b8a0669585d51a3
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 15:33:24 2019 +0200

    Extract a few cmake commands to dedicated files rather than generating them on the fly
    
    This simplifies a number of escape sequences.
    
    The generated file to configure the man page was split up a bit further:
    - code that extracted the GNC_VCS_REV_Y_M from gnc-vcs-info.h was spun out
      into its own function that now sets all parameters in gnc-vcs-info.h
      as environment variables.
    - this function is now invoked by configure-manpage.cmake to extract
      the date to insert into the manpage.
    - the manpage in addition now shows the full date rather than only
      yyyy-mm. This is how man itself does it as well.

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 05b9b07b1..deaebf2b1 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -8,4 +8,7 @@ if (APPLE)
 endif(APPLE)
 
 
-set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)
+set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in
+    configure-manpage.cmake git2version-info.cmake
+    version-info2env.cmake
+)
diff --git a/cmake/configure-manpage.cmake b/cmake/configure-manpage.cmake
new file mode 100644
index 000000000..fbef1dda8
--- /dev/null
+++ b/cmake/configure-manpage.cmake
@@ -0,0 +1,17 @@
+# Command to configure the gnucash man page
+# These commands are store in a separate cmake file as they have to be
+# rerun depending on build conditions, not depending on cmake conditions
+# (such as did the version string change or not)
+#
+# The following environment variables are used and should be properly set
+# by the calling code:
+# - SRC_DIR (top level source code directory)
+# - SRC (full path to gnc-vcs-info.h.in)
+# - DST (full path to destination for gnc-vcs-info.h)
+# - VCS_INFO_FILE (full path to gnc-vcs-info.h - can be in source tree (release builds) or build tree (git builds))
+
+include (${SRC_DIR}/cmake/version-info2env.cmake)
+versioninfo2env (${VCS_INFO_FILE})
+configure_file(${SRC} ${DST} )
+file(COPY gnucash.1
+DESTINATION ${DATADIR_BUILD}/gnucash)
diff --git a/cmake/git2version-info.cmake b/cmake/git2version-info.cmake
new file mode 100644
index 000000000..dec89b70b
--- /dev/null
+++ b/cmake/git2version-info.cmake
@@ -0,0 +1,28 @@
+# Create the gnc-vcs-info.h file starting from git.
+# It currently sets four parameters
+# - GNC_VCS_REV
+# - GNC_VCS_REV_DATE
+# - GNC_VCS_REV_YEAR
+# - GNC_VCS_REV_Y_M
+# The following environment variables are used and should be properly set
+# by the calling code:
+# - SHELL (should point at a bash shell or compatible)
+# - SRC_DIR (top level source code directory)
+# - SRC (full path to gnc-vcs-info.h.in)
+# - DST (full path to destination for gnc-vcs-info.h)
+
+
+execute_process(
+    COMMAND ${SHELL} "${SRC_DIR}/util/gnc-vcs-info" -r "${SRC_DIR}"
+    OUTPUT_VARIABLE GNC_VCS_REV
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+
+execute_process(
+    COMMAND ${SHELL} "${SRC_DIR}/util/gnc-vcs-info" -d "${SRC_DIR}"
+    OUTPUT_VARIABLE GNC_VCS_REV_DATE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+string(SUBSTRING ${GNC_VCS_REV_DATE} 0 4 GNC_VCS_REV_YEAR)
+string(SUBSTRING ${GNC_VCS_REV_DATE} 0 7 GNC_VCS_REV_Y_M)
+configure_file(${SRC} ${DST} @ONLY)
diff --git a/cmake/version-info2env.cmake b/cmake/version-info2env.cmake
new file mode 100644
index 000000000..c612bd9f8
--- /dev/null
+++ b/cmake/version-info2env.cmake
@@ -0,0 +1,13 @@
+# Extract the parameters set in _VCS_INFO_FILE and export them as environment variables
+
+# _VCS_INFO_FILE should be the full path to gnc-vcs-info.h
+
+function (versioninfo2env _VCS_INFO_FILE)
+    file(STRINGS ${_VCS_INFO_FILE} lines REGEX "#define")
+    foreach(line ${lines})
+        string(REGEX REPLACE "^.* (.*) \"(.*)\"" "\\1;\\2" _param_val ${line})
+        list(GET _param_val 0 _param)
+        list(GET _param_val 1 _val)
+        set(${_param} ${_val} PARENT_SCOPE)
+    endforeach()
+endfunction()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 0d1235a89..7e7f81294 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -62,18 +62,6 @@ else()
 endif()
 set(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h)
 
-# The copious use of backslashes below is to escape escape sequences that
-# have to end up in the file being written...
-# eg \\\" will become \", \\\\1 will become \\1 (which cmake will then interpret as \1)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/manpage.cmake
-"file(STRINGS \${VCS_INFO_FILE} ym_line REGEX \"GNC_VCS_REV_Y_M\")
-string(REGEX REPLACE \"^.* \\\"(.*)\\\"\" \"\\\\1\" DATE \${ym_line})
-configure_file(\${SRC} \${DST} )
-file(COPY gnucash.1
-  DESTINATION \${DATADIR_BUILD}/gnucash)
-")
-
-
 add_custom_command(OUTPUT gnucash.1
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in gnc-vcs-info
   COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in
@@ -81,7 +69,8 @@ add_custom_command(OUTPUT gnucash.1
                            -D VERSION=${VERSION}
                            -D VCS_INFO_FILE=${VCS_INFO_FILE}
                            -D DATADIR_BUILD=${DATADIR_BUILD}
-                           -P ${CMAKE_CURRENT_BINARY_DIR}/manpage.cmake
+                           -D SRC_DIR=${CMAKE_SOURCE_DIR}
+                           -P ${CMAKE_SOURCE_DIR}/cmake/configure-manpage.cmake
   )
 add_custom_target(gnucash-manpage DEPENDS gnucash.1)
 dist_add_generated (${BUILDING_FROM_VCS} gnucash.1)
diff --git a/doc/gnucash.1.in b/doc/gnucash.1.in
index 7d7a42c49..bf56ee86e 100644
--- a/doc/gnucash.1.in
+++ b/doc/gnucash.1.in
@@ -2,7 +2,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH GNUCASH 1 "@DATE@" "Version @VERSION@" "GnuCash Manual Pages"
+.TH GNUCASH 1 "@GNC_VCS_REV_DATE@" "Version @VERSION@" "GnuCash Manual Pages"
 .SH NAME
 gnucash \- personal finance manager
 .SH SYNOPSIS
diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
index a2ceb2979..647b22041 100644
--- a/libgnucash/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -54,29 +54,13 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h.in
 #define GNC_VCS_REV_Y_M \"@GNC_VCS_REV_Y_M@\"
 ")
 
-set(SCM_REV_COMMAND "${CMAKE_SOURCE_DIR}/util/gnc-vcs-info -r")
-set(SCM_REV_DATE_COMMAND "${CMAKE_SOURCE_DIR}/util/gnc-vcs-info -d")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
-  "execute_process(
-    COMMAND ${SHELL} ${SCM_REV_COMMAND} ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GNC_VCS_REV
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  execute_process(
-    COMMAND ${SHELL} ${SCM_REV_DATE_COMMAND} ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GNC_VCS_REV_DATE
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  string(SUBSTRING \${GNC_VCS_REV_DATE} 0 4 GNC_VCS_REV_YEAR)
-  string(SUBSTRING \${GNC_VCS_REV_DATE} 0 7 GNC_VCS_REV_Y_M)
-  configure_file(\${SRC} \${DST} @ONLY)
-")
-
 add_custom_target(gnc-vcs-info ALL
     BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
     COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h.in
                              -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
-                             -P ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
+                             -D SRC_DIR=${CMAKE_SOURCE_DIR}
+                             -D SHELL="${SHELL}"
+                             -P ${CMAKE_SOURCE_DIR}/cmake/git2version-info.cmake
 )
 else(BUILDING_FROM_VCS)
   add_custom_target(gnc-vcs-info DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnc-vcs-info.h)

commit 0e9e3c107debc6121d54a28d7fb38b26b154415f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 12:42:19 2019 +0200

    Drop code path for cmake 3.1 and older
    
    We require cmake 3.5

diff --git a/libgnucash/core-utils/CMakeLists.txt b/libgnucash/core-utils/CMakeLists.txt
index a84be486b..a2ceb2979 100644
--- a/libgnucash/core-utils/CMakeLists.txt
+++ b/libgnucash/core-utils/CMakeLists.txt
@@ -72,21 +72,12 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
   configure_file(\${SRC} \${DST} @ONLY)
 ")
 
-if (${CMAKE_VERSION} VERSION_GREATER "3.1")
-  add_custom_target(gnc-vcs-info ALL
+add_custom_target(gnc-vcs-info ALL
     BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
     COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h.in
-                     -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
-                     -P ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
-  )
-else()
-  # BYPRODUCTS keyword not supported below 3.2
-  add_custom_target(gnc-vcs-info ALL
-    COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h.in
-                     -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
-                     -P ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
-  )
-endif()
+                             -D DST=${CMAKE_CURRENT_BINARY_DIR}/gnc-vcs-info.h
+                             -P ${CMAKE_CURRENT_BINARY_DIR}/version.cmake
+)
 else(BUILDING_FROM_VCS)
   add_custom_target(gnc-vcs-info DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnc-vcs-info.h)
 endif(BUILDING_FROM_VCS)

commit 9b6df51e58b0ab4ecd0759d803b84bbefe7c3f60
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 12:26:34 2019 +0200

    Fix man page title line
    
    * 'Version x.y' should be treated as one parameter
    * Add a page title

diff --git a/doc/gnucash.1.in b/doc/gnucash.1.in
index e5e87f0f1..7d7a42c49 100644
--- a/doc/gnucash.1.in
+++ b/doc/gnucash.1.in
@@ -2,7 +2,7 @@
 .\" Process this file with
 .\" groff -man -Tascii foo.1
 .\"
-.TH GNUCASH 1 "@DATE@" Version "@VERSION@"
+.TH GNUCASH 1 "@DATE@" "Version @VERSION@" "GnuCash Manual Pages"
 .SH NAME
 gnucash \- personal finance manager
 .SH SYNOPSIS

commit 17848038119bdbd299634ac0ca53bcec939ed4ac
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 12:04:49 2019 +0200

    Appdata - sort tags
    
    All tags except for the core information (id, name, summary and description)
    are sorted alphabetically for easier lookup. The core tags are kept on top
    though.

diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
index e85159a51..0f2dae42f 100644
--- a/gnucash/gnome/gnucash.appdata.xml.in
+++ b/gnucash/gnome/gnucash.appdata.xml.in
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component>
   <id>org.gnucash.GnuCash</id>
-  <launchable type="desktop-id">gnucash.desktop</launchable>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
   <name>GnuCash</name>
   <summary>Manage your finances, accounts, and investments</summary>
   <description>
@@ -25,13 +22,17 @@
       <li>Perform financial calculations, such as a loan repayment</li>
     </ul>
   </description>
-  <developer_name>GnuCash Project</developer_name>
+
   <categories>
     <category>Finance</category>
   </categories>
   <content_rating type="oars-1.1">
     <content_attribute id="social-info">mild</content_attribute>
   </content_rating>
+  <developer_name>GnuCash Project</developer_name>
+  <launchable type="desktop-id">gnucash.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
   <screenshots>
     <screenshot type="default">
       <image type="source" width="1049" height="590">https://www.gnucash.org/images/features/feature_accounts_lg.png</image>
@@ -43,6 +44,7 @@
       <image type="source" width="1049" height="590">https://www.gnucash.org/images/features/feature_bar_chart_lg.png</image>
     </screenshot>
   </screenshots>
+  <update_contact>gnucash-devel at gnucash.org</update_contact>
   <translation type="gettext">gnucash</translation>
   <url type="homepage">https://www.gnucash.org</url>
   <url type="bugtracker">https://bugs.gnucash.org</url>
@@ -50,5 +52,4 @@
   <url type="help">https://gnucash.org/docs.phtml</url>
   <url type="donation">https://gnucash.org/donate.phtml</url>
   <url type="translate">https://wiki.gnucash.org/wiki/Translation</url>
-  <update_contact>gnucash-devel at gnucash.org</update_contact>
 </component>

commit 919c2b305d7d1a28f6400e77e9856e2cfda74f22
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Aug 24 11:59:30 2019 +0200

    Appdata - add language tag

diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
index cfd6f19c9..e85159a51 100644
--- a/gnucash/gnome/gnucash.appdata.xml.in
+++ b/gnucash/gnome/gnucash.appdata.xml.in
@@ -43,6 +43,7 @@
       <image type="source" width="1049" height="590">https://www.gnucash.org/images/features/feature_bar_chart_lg.png</image>
     </screenshot>
   </screenshots>
+  <translation type="gettext">gnucash</translation>
   <url type="homepage">https://www.gnucash.org</url>
   <url type="bugtracker">https://bugs.gnucash.org</url>
   <url type="faq">https://wiki.gnucash.org/wiki/FAQ</url>

commit 3d608efc2211127f88b028988fe102425046759d
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Aug 23 19:51:13 2019 +0800

    [test-options] add to CMakeLists.txt
    
    forgto to add to dist_list.

diff --git a/libgnucash/app-utils/test/CMakeLists.txt b/libgnucash/app-utils/test/CMakeLists.txt
index dd9e259a1..435250c60 100644
--- a/libgnucash/app-utils/test/CMakeLists.txt
+++ b/libgnucash/app-utils/test/CMakeLists.txt
@@ -84,6 +84,7 @@ set_dist_list(test_app_utils_DIST
   test-sx.cpp
   test-c-interface.scm
   test-date-utilities.scm
+  test-options.scm
   ${test_app_utils_scheme_SOURCES}
   ${test_app_utils_SOURCES}
 )

commit 67751665b3011b2049d0aa6bf2b8a2556cec334b
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Fri Aug 23 18:55:55 2019 +0800

    [taxtxf(-de_DE)] compact functions, use srfi-2
    
    srfi-2 and-let* allows concise code and returns #f if any intermediate
    var is #f.

diff --git a/libgnucash/tax/us/txf-de_DE.scm b/libgnucash/tax/us/txf-de_DE.scm
index c3df5342b..c93cdc3f6 100644
--- a/libgnucash/tax/us/txf-de_DE.scm
+++ b/libgnucash/tax/us/txf-de_DE.scm
@@ -46,6 +46,7 @@
 
 
 (use-modules (gnucash app-utils))
+(use-modules (srfi srfi-2))
 
 (define txf-tax-entity-types
   (list
@@ -53,11 +54,8 @@
    (cons 'Other #("None" "Keine Steuerberichtsoptionen vorhanden"))))
 
 (define (gnc:tax-type-txf-get-code-info tax-entity-types type-code index)
-  (if (assv type-code tax-entity-types)
-      (let ((tax-entity-type (assv type-code tax-entity-types)))
-           (and tax-entity-type
-                (vector-ref (cdr tax-entity-type) index)))
-      #f))
+  (and-let* ((tax-entity-type (assv-ref tax-entity-types type-code)))
+    (vector-ref tax-entity-type index)))
 
 (define (gnc:txf-get-tax-entity-type type-code)
   (gnc:tax-type-txf-get-code-info txf-tax-entity-types type-code 0))
@@ -81,64 +79,41 @@
 (define (gnc:txf-get-category-key categories code tax-entity-type)
   (gnc:txf-get-code-info categories code 5 tax-entity-type))
 (define (gnc:txf-get-line-data categories code tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let* ((tax-entity-codes (cdr (assv (string->symbol tax-entity-type)
-                                          categories)))
-             (category (if (assv code tax-entity-codes)
-                           (assv code tax-entity-codes)
-                           #f)))
-            (if (or (not category) (< (vector-length (cdr category)) 7))
-                #f
-                (gnc:txf-get-code-info categories code 6 tax-entity-type)))
-      #f))
+  (and-let* ((sym (string->symbol tax-entity-type))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code))
+             ((>= (vector-length category) 7)))
+    (gnc:txf-get-code-info categories code 6 tax-entity-type)))
 (define (gnc:txf-get-last-year categories code tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let* ((tax-entity-codes (cdr (assv (string->symbol tax-entity-type)
-                                          categories)))
-             (category (if (assv code tax-entity-codes)
-                           (assv code tax-entity-codes)
-                           #f)))
-            (if (or (not category) (< (vector-length (cdr category)) 8))
-                #f
-                (gnc:txf-get-code-info categories code 7 tax-entity-type)))
-      #f))
+  (and-let* ((sym (string->symbol tax-entity-type))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code))
+             ((>= (vector-length category) 8)))
+    (gnc:txf-get-code-info categories code 7 tax-entity-type)))
 
 (define (gnc:txf-get-help categories code)
-  (let ((pair (assv code txf-help-strings)))
-    (if pair
-        (cdr pair)
-        "Keine Hilfe verfÃ¼gbar, da nur GruppenÃ¼berschrift.
+  (or (assv-ref txf-help-strings code)
+      "Keine Hilfe verfÃ¼gbar, da nur GruppenÃ¼berschrift.
 Diese Kategorie ohne Nummer ==>> N I C H T   V E R W E N D E N !
 USt-Kategorien 2011 fÃ¼r GnuCash Vers. 2.4.0 entwickelt und erstellt von: FJSW
-Fehlermeldungen + Dankschreiben an: stoll at bomhardt.de")))
+Fehlermeldungen + Dankschreiben an: stoll at bomhardt.de"))
 
 (define (gnc:txf-get-codes categories tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let* ((tax-entity-code-list-pair (assv (if (eqv? tax-entity-type "")
-                                               'Ind
-                                               (string->symbol tax-entity-type))
-                                              categories))
-             (tax-entity-codes (if tax-entity-code-list-pair
-                                   (cdr tax-entity-code-list-pair)
-                                   '())))
-            (map car tax-entity-codes))
-      #f))
+  (and-let* ((sym (if (string-null? tax-entity-type)
+                      'Ind
+                      (string->symbol tax-entity-type)))
+             (tax-entity-codes (assv-ref categories sym)))
+    (map car tax-entity-codes)))
 
 ;;;; Private
 
 (define (gnc:txf-get-code-info categories code index tax-entity-type)
-  (let* ((tax-entity-code-list-pair (assv (if (eqv? tax-entity-type "")
-                                              'Ind
-                                              (string->symbol tax-entity-type))
-                                          categories))
-         (tax-entity-codes (if tax-entity-code-list-pair
-                               (cdr tax-entity-code-list-pair)
-                               '()))
-         (category (assv code tax-entity-codes)))
-        (if category
-            (and category
-                 (vector-ref (cdr category) index))
-            #f)))
+  (and-let* ((sym (if (string-null? tax-entity-type)
+                      'Ind
+                      (string->symbol tax-entity-type)))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code)))
+    (vector-ref category index)))
 
 (define txf-help-categories
   (list
diff --git a/libgnucash/tax/us/txf.scm b/libgnucash/tax/us/txf.scm
index ffdb6f78d..ef551bea3 100644
--- a/libgnucash/tax/us/txf.scm
+++ b/libgnucash/tax/us/txf.scm
@@ -41,6 +41,7 @@
 
 
 (use-modules (gnucash app-utils))
+(use-modules (srfi srfi-2))
 
 (define txf-tax-entity-types
   (list
@@ -51,11 +52,8 @@
    (cons 'Other #("None" "No Income Tax Options Provided"))))
 
 (define (gnc:tax-type-txf-get-code-info tax-entity-types type-code index)
-  (if (assv type-code tax-entity-types)
-      (let ((tax-entity-type (assv type-code tax-entity-types)))
-           (and tax-entity-type
-                (vector-ref (cdr tax-entity-type) index)))
-      #f))
+  (and-let* ((tax-entity-type (assv-ref tax-entity-types type-code)))
+    (vector-ref tax-entity-type index)))
 
 (define (gnc:txf-get-tax-entity-type type-code)
   (gnc:tax-type-txf-get-code-info txf-tax-entity-types type-code 0))
@@ -78,57 +76,37 @@
   (gnc:txf-get-code-info categories code 4 tax-entity-type))
 (define (gnc:txf-get-category-key categories code tax-entity-type)
   (gnc:txf-get-code-info categories code 5 tax-entity-type))
+
 (define (gnc:txf-get-line-data categories code tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let* ((tax-entity-codes (cdr (assv (string->symbol tax-entity-type)
-                                          categories)))
-             (category (if (assv code tax-entity-codes)
-                           (assv code tax-entity-codes)
-                           #f)))
-            (if (or (not category) (< (vector-length (cdr category)) 7))
-                #f
-                (gnc:txf-get-code-info categories code 6 tax-entity-type)))
-      #f))
+  (and-let* ((sym (string->symbol tax-entity-type))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code))
+             ((>= (vector-length category) 7)))
+    (gnc:txf-get-code-info categories code 6 tax-entity-type)))
+
 (define (gnc:txf-get-last-year categories code tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let* ((tax-entity-codes (cdr (assv (string->symbol tax-entity-type)
-                                          categories)))
-             (category (if (assv code tax-entity-codes)
-                           (assv code tax-entity-codes)
-                           #f)))
-            (if (or (not category) (< (vector-length (cdr category)) 8))
-                #f
-                (gnc:txf-get-code-info categories code 7 tax-entity-type)))
-      #f))
+  (and-let* ((sym (string->symbol tax-entity-type))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code))
+             ((>= (vector-length category) 8)))
+    (gnc:txf-get-code-info categories code 7 tax-entity-type)))
 
 (define (gnc:txf-get-help categories code)
-  (let ((pair (assv code txf-help-strings)))
-    (if pair
-        (cdr pair)
-        (_ "No help available.") )))
+  (or (assv-ref txf-help-strings code)
+      (_ "No help available.")))
 
 (define (gnc:txf-get-codes categories tax-entity-type)
-  (if (assv (string->symbol tax-entity-type) categories)
-      (let ((tax-entity-codes (cdr (assv (string->symbol tax-entity-type)
-                                                                 categories))))
-           (map car tax-entity-codes))
-      #f))
+  (and-let* ((sym (string->symbol tax-entity-type))
+             (tax-entity-codes (assv-ref categories sym)))
+    (map car tax-entity-codes)))
 
 (define (gnc:txf-get-code-info categories code index tax-entity-type)
-  (if (or (assv (string->symbol tax-entity-type) categories)
-          (eqv? tax-entity-type ""))
-      (let* ((tax-entity-codes (cdr (assv (if (eqv? tax-entity-type "")
-                                              'F1040
-                                              (string->symbol tax-entity-type))
-                                          categories)))
-             (category (if (assv code tax-entity-codes)
-                           (assv code tax-entity-codes)
-                           #f)))
-            (if category
-                (and category
-                     (vector-ref (cdr category) index))
-                #f))
-      #f))
+  (and-let* ((sym (if (string-null? tax-entity-type)
+                      'F1040
+                      (string->symbol tax-entity-type)))
+             (tax-entity-codes (assv-ref categories sym))
+             (category (assv-ref tax-entity-codes code)))
+    (vector-ref category index)))
 
 (define txf-help-categories
   (list

commit 123033e5ea31beb21dc1e75cb50c9cf5432cc34a
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Aug 22 18:54:59 2019 +0800

    [standard-reports] modernise to srfi-9 records

diff --git a/gnucash/report/standard-reports/standard-reports.scm b/gnucash/report/standard-reports/standard-reports.scm
index 235f763c8..321f0997d 100644
--- a/gnucash/report/standard-reports/standard-reports.scm
+++ b/gnucash/report/standard-reports/standard-reports.scm
@@ -25,6 +25,7 @@
 
 
 (define-module (gnucash report standard-reports))
+(use-modules (srfi srfi-9))
 (use-modules (srfi srfi-13))
 (use-modules (gnucash utilities))
 (use-modules (gnucash core-utils))
@@ -39,26 +40,15 @@
 ;; or without split.  If no function is found, then run the 'default'
 ;; function
 
-(define acct-type-info (make-record-type "AcctTypeInfo" '(split non-split)))
-
-(define make-acct-type-private
-  (record-constructor acct-type-info '(split non-split)))
+(define-record-type :acct-type-info
+  (make-acct-type-private split non-split)
+  acct-type-info?
+  (split get-split set-split)
+  (non-split get-non-split set-non-split))
 
 (define (make-acct-type)
   (make-acct-type-private #f #f))
 
-(define get-split
-  (record-accessor acct-type-info 'split))
-
-(define set-split
-  (record-modifier acct-type-info 'split))
-
-(define get-non-split
-  (record-accessor acct-type-info 'non-split))
-
-(define set-non-split
-  (record-modifier acct-type-info 'non-split))
-
 (define (gnc:register-report-hook acct-type split? create-fcn)
   (let ((type-info (hash-ref gnc:*register-report-hash* acct-type (make-acct-type))))
     (if split?

commit 53b7cba11e63fc0a7ebfdcfe6903ece205f6c345
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Aug 20 15:25:46 2019 +0100

    Reformat source files gnc-tree-view.c/h
    
    Replace tabs with spaces and changes spaces where appropriate.

diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index 9ee151aac..820c0258d 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -77,8 +77,7 @@ static QofLogModule log_module = GNC_MOD_GUI;
 
 /**** Declarations ******************************************************/
 static void gnc_tree_view_class_init (GncTreeViewClass *klass);
-static void gnc_tree_view_init (GncTreeView *view,
-		                void *data);
+static void gnc_tree_view_init (GncTreeView *view, void *data);
 static void gnc_tree_view_finalize (GObject *object);
 static void gnc_tree_view_destroy (GtkWidget *widget);
 static void gnc_tree_view_set_property (GObject         *object,
@@ -129,7 +128,7 @@ typedef struct GncTreeViewPrivate
 } GncTreeViewPrivate;
 
 GNC_DEFINE_TYPE_WITH_CODE(GncTreeView, gnc_tree_view, GTK_TYPE_TREE_VIEW,
-		          G_ADD_PRIVATE(GncTreeView))
+                          G_ADD_PRIVATE(GncTreeView))
 
 #define GNC_TREE_VIEW_GET_PRIVATE(o)  \
    (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNC_TYPE_TREE_VIEW, GncTreeViewPrivate))
@@ -161,8 +160,8 @@ gnc_tree_view_class_init (GncTreeViewClass *klass)
 
     parent_class = g_type_class_peek_parent (klass);
 
-    gobject_class = G_OBJECT_CLASS (klass);
-    gtkwidget_class = GTK_WIDGET_CLASS (klass);
+    gobject_class = G_OBJECT_CLASS(klass);
+    gtkwidget_class = GTK_WIDGET_CLASS(klass);
 
     gobject_class->set_property = gnc_tree_view_set_property;
     gobject_class->get_property = gnc_tree_view_get_property;
@@ -244,8 +243,8 @@ gnc_tree_view_init (GncTreeView *view, void *data)
 
     GncTreeViewClass *klass = (GncTreeViewClass*)data;
 
-    gnc_gobject_tracking_remember(G_OBJECT(view),
-		                  G_OBJECT_CLASS(klass));
+    gnc_gobject_tracking_remember (G_OBJECT(view),
+                                   G_OBJECT_CLASS(klass));
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     priv->column_menu = NULL;
@@ -261,8 +260,8 @@ gnc_tree_view_init (GncTreeView *view, void *data)
     gnc_widget_set_style_context (GTK_WIDGET(view), "GncTreeView");
 
     /* Handle column drag and drop */
-    gtk_tree_view_set_column_drag_function(GTK_TREE_VIEW(view),
-                                           gnc_tree_view_drop_ok_cb, NULL, NULL);
+    gtk_tree_view_set_column_drag_function (GTK_TREE_VIEW(view),
+                                            gnc_tree_view_drop_ok_cb, NULL, NULL);
 
     // Set grid lines option to preference
     gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(view), gnc_tree_view_get_grid_lines_pref ());
@@ -284,24 +283,24 @@ gnc_tree_view_init (GncTreeView *view, void *data)
 #else
     gtk_widget_set_margin_left (GTK_WIDGET(icon), 5);
 #endif
-    gtk_box_pack_end (GTK_BOX (priv->column_menu_icon_box), icon, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX(priv->column_menu_icon_box), icon, FALSE, FALSE, 0);
 
     sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-    gtk_box_pack_end (GTK_BOX (priv->column_menu_icon_box), sep, FALSE, FALSE, 0);
+    gtk_box_pack_end (GTK_BOX(priv->column_menu_icon_box), sep, FALSE, FALSE, 0);
 
     gtk_widget_show_all (priv->column_menu_icon_box);
 
-    g_signal_connect (G_OBJECT (icon), "draw",
-                      G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1));
+    g_signal_connect (G_OBJECT(icon), "draw",
+                      G_CALLBACK(gnc_draw_arrow_cb), GINT_TO_POINTER(1));
 
     column = gnc_tree_view_add_text_column (view, NULL, NULL, NULL, NULL,
                                             -1, -1, NULL);
-    g_object_set(G_OBJECT(column),
-                 "clickable", TRUE,
-                 "widget", priv->column_menu_icon_box,
-                 "alignment", 1.0,
-                 "expand", TRUE,
-                 (gchar *)NULL);
+    g_object_set (G_OBJECT(column),
+                  "clickable", TRUE,
+                  "widget", priv->column_menu_icon_box,
+                  "alignment", 1.0,
+                  "expand", TRUE,
+                  (gchar *)NULL);
 
     priv->column_menu_column = column;
 
@@ -316,7 +315,7 @@ gnc_tree_view_init (GncTreeView *view, void *data)
         {
             // this will fire for the whole column header
             g_signal_connect (G_OBJECT(column), "clicked",
-                              G_CALLBACK (gnc_tree_view_select_column_cb),
+                              G_CALLBACK(gnc_tree_view_select_column_cb),
                               view);
         }
         else
@@ -327,7 +326,7 @@ gnc_tree_view_init (GncTreeView *view, void *data)
             gtk_widget_set_events (button, GDK_BUTTON_PRESS_MASK);
 
             g_signal_connect (G_OBJECT(button), "button_press_event",
-                              G_CALLBACK (gnc_tree_view_select_column_icon_cb),
+                              G_CALLBACK(gnc_tree_view_select_column_icon_cb),
                               view);
         }
     }
@@ -349,12 +348,12 @@ gnc_tree_view_finalize (GObject *object)
 {
     ENTER("view %p", object);
     g_return_if_fail (object != NULL);
-    g_return_if_fail (GNC_IS_TREE_VIEW (object));
+    g_return_if_fail (GNC_IS_TREE_VIEW(object));
 
-    gnc_gobject_tracking_forget(object);
+    gnc_gobject_tracking_forget (object);
 
-    if (G_OBJECT_CLASS (parent_class)->finalize)
-        G_OBJECT_CLASS (parent_class)->finalize (object);
+    if (G_OBJECT_CLASS(parent_class)->finalize)
+        G_OBJECT_CLASS(parent_class)->finalize (object);
     LEAVE(" ");
 }
 
@@ -377,9 +376,9 @@ gnc_tree_view_destroy (GtkWidget *widget)
 
     ENTER("view %p", widget);
     g_return_if_fail (widget != NULL);
-    g_return_if_fail (GNC_IS_TREE_VIEW (widget));
+    g_return_if_fail (GNC_IS_TREE_VIEW(widget));
 
-    view = GNC_TREE_VIEW (widget);
+    view = GNC_TREE_VIEW(widget);
 
     gnc_prefs_remove_cb_by_func (GNC_PREFS_GROUP_GENERAL, GNC_PREF_GRID_LINES_HORIZONTAL,
                                  gnc_tree_view_update_grid_lines, view);
@@ -392,18 +391,18 @@ gnc_tree_view_destroy (GtkWidget *widget)
     {
         gnc_tree_view_save_state (view);
     }
-    g_free(priv->state_section);
+    g_free (priv->state_section);
     priv->state_section = NULL;
 
     if (priv->column_menu)
     {
         DEBUG("removing column selection menu");
-        g_object_unref(priv->column_menu);
+        g_object_unref (priv->column_menu);
         priv->column_menu = NULL;
     }
 
-    if (GTK_WIDGET_CLASS (parent_class)->destroy)
-        GTK_WIDGET_CLASS (parent_class)->destroy (widget);
+    if (GTK_WIDGET_CLASS(parent_class)->destroy)
+        GTK_WIDGET_CLASS(parent_class)->destroy (widget);
     LEAVE(" ");
 }
 
@@ -429,7 +428,7 @@ gnc_tree_view_get_property (GObject     *object,
                             GValue      *value,
                             GParamSpec  *pspec)
 {
-    GncTreeView *view = GNC_TREE_VIEW (object);
+    GncTreeView *view = GNC_TREE_VIEW(object);
     GncTreeViewPrivate *priv;
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
@@ -442,7 +441,7 @@ gnc_tree_view_get_property (GObject     *object,
         g_value_set_boolean (value, priv->show_column_menu);
         break;
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
     }
 }
@@ -462,7 +461,7 @@ gnc_tree_view_set_property (GObject      *object,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
-    GncTreeView *view = GNC_TREE_VIEW (object);
+    GncTreeView *view = GNC_TREE_VIEW(object);
 
     switch (prop_id)
     {
@@ -473,7 +472,7 @@ gnc_tree_view_set_property (GObject      *object,
         gnc_tree_view_set_show_column_menu (view, g_value_get_boolean (value));
         break;
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
     }
 }
@@ -510,17 +509,17 @@ view_column_find_by_model_id (GncTreeView *view,
     gint id;
 
     // ENTER("view %p, name %s", view, name);
-    column_list = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-    for (tmp = column_list; tmp; tmp = g_list_next(tmp))
+    column_list = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
+    for (tmp = column_list; tmp; tmp = g_list_next (tmp))
     {
         column = tmp->data;
-        id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), MODEL_COLUMN));
+        id = GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), MODEL_COLUMN));
         if (id != wanted)
             continue;
         found = column;
         break;
     }
-    g_list_free(column_list);
+    g_list_free (column_list);
 
     // LEAVE("column %p", found);
     return found;
@@ -546,16 +545,16 @@ gnc_tree_view_find_column_by_name (GncTreeView *view,
 
     // ENTER("view %p, wanted %s", view, wanted);
     column_list = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-    for (tmp = column_list; tmp; tmp = g_list_next(tmp))
+    for (tmp = column_list; tmp; tmp = g_list_next (tmp))
     {
         column = tmp->data;
-        name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+        name = g_object_get_data (G_OBJECT(column), PREF_NAME);
         if (!name || (strcmp(name, wanted) != 0))
             continue;
         found = column;
         break;
     }
-    g_list_free(column_list);
+    g_list_free (column_list);
 
     // LEAVE("column %p", found);
     return found;
@@ -620,7 +619,7 @@ gnc_tree_view_drop_ok_cb (GtkTreeView *view,
      * the column where the "column selection widget" is stored, and the
      * "padding" column to the left of that where extra view space ends
      * up. */
-    pref_name = g_object_get_data(G_OBJECT(prev_column), PREF_NAME);
+    pref_name = g_object_get_data (G_OBJECT(prev_column), PREF_NAME);
     if (!pref_name)
         return FALSE;
 
@@ -669,12 +668,12 @@ gnc_tree_view_column_visible (GncTreeView *view,
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     if (column)
     {
-        if (g_object_get_data(G_OBJECT(column), ALWAYS_VISIBLE))
+        if (g_object_get_data (G_OBJECT(column), ALWAYS_VISIBLE))
         {
             LEAVE("1, first column");
             return TRUE;
         }
-        col_name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+        col_name = g_object_get_data (G_OBJECT(column), PREF_NAME);
         DEBUG("col_name is %s", col_name ? col_name : "(null)");
     }
 
@@ -688,12 +687,12 @@ gnc_tree_view_column_visible (GncTreeView *view,
     if (priv->state_section)
     {
         GKeyFile *state_file = gnc_state_get_current ();
-        gchar *key = g_strdup_printf("%s_%s", col_name, STATE_KEY_SUFF_VISIBLE);
+        gchar *key = g_strdup_printf ("%s_%s", col_name, STATE_KEY_SUFF_VISIBLE);
 
         if (g_key_file_has_key (state_file, priv->state_section, key, NULL))
         {
             visible = g_key_file_get_boolean (state_file, priv->state_section, key, NULL);
-            g_free(key);
+            g_free (key);
             LEAVE("%d, state defined visibility", visible);
             return visible;
         }
@@ -701,7 +700,7 @@ gnc_tree_view_column_visible (GncTreeView *view,
 
     /* Check the default columns list */
     visible = column ?
-              (g_object_get_data(G_OBJECT(column), DEFAULT_VISIBLE) != NULL) : FALSE;
+              (g_object_get_data (G_OBJECT(column), DEFAULT_VISIBLE) != NULL) : FALSE;
     LEAVE("defaults says %d", visible);
     return visible;
 }
@@ -722,12 +721,12 @@ gnc_tree_view_update_visibility (GtkTreeViewColumn *column,
 {
     gboolean visible;
 
-    g_return_if_fail(GTK_IS_TREE_VIEW_COLUMN(column));
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN(column));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER(" ");
-    visible = gnc_tree_view_column_visible(view, column, NULL);
-    gtk_tree_view_column_set_visible(column, visible);
+    visible = gnc_tree_view_column_visible (view, column, NULL);
+    gtk_tree_view_column_set_visible (column, visible);
     LEAVE("made %s", visible ? "visible" : "invisible");
 }
 
@@ -749,15 +748,15 @@ gnc_tree_view_get_sort_order (GncTreeView *view)
     gint current;
     gchar *order_str = NULL;
 
-    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
     if (!s_model)
         return NULL; /* no model, so sort order doesn't make sense */
 
-    if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
+    if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE(s_model),
             &current, &order))
         return NULL; /* Model is not sorted, return */
 
-    gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(s_model),
                                          current, order);
     order_str = g_strdup (order == GTK_SORT_ASCENDING ? "ascending" : "descending");
     DEBUG("current sort_order is %s", order_str);
@@ -782,11 +781,11 @@ gnc_tree_view_get_sort_column (GncTreeView *view)
     gint current;
     const gchar *name;
 
-    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
     if (!s_model)
         return NULL; /* no model -> no sort column */
 
-    if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
+    if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE(s_model),
             &current, &order))
         return NULL; /* model not sorted */
 
@@ -794,7 +793,7 @@ gnc_tree_view_get_sort_column (GncTreeView *view)
     if (!column)
         return NULL; /* column not visible, can't be used for sorting */
 
-    name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+    name = g_object_get_data (G_OBJECT(column), PREF_NAME);
     DEBUG("current sort column is %s", name ? name : "(NULL)");
     return g_strdup (name);
 }
@@ -828,7 +827,7 @@ gnc_tree_view_get_column_order (GncTreeView *view,
     for (tmp = columns; tmp; tmp = g_list_next(tmp))
     {
         GtkTreeViewColumn *column = tmp->data;
-        const gchar *name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+        const gchar *name = g_object_get_data (G_OBJECT(column), PREF_NAME);
         if (!col_names)
             col_names = g_strdup (name);
         else
@@ -843,7 +842,7 @@ gnc_tree_view_get_column_order (GncTreeView *view,
     col_str_list = g_strsplit (col_names, ";", 0);
 
     /* Clean up */
-    g_list_free(columns);
+    g_list_free (columns);
     g_free (col_names);
 
     LEAVE("column order get");
@@ -869,16 +868,16 @@ gnc_tree_view_set_sort_order (GncTreeView *view,
     GtkSortType order = GTK_SORT_ASCENDING;
     gint current;
 
-    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
     if (!s_model)
         return;
     if (g_strcmp0 (name, "descending") == 0)
         order = GTK_SORT_DESCENDING;
-    if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
+    if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE(s_model),
             &current, NULL))
         current = GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID;
-    gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
-                                         current, order);
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(s_model),
+                                          current, order);
     DEBUG("sort_order set to %s", order == GTK_SORT_ASCENDING ? "ascending" : "descending");
 }
 
@@ -899,30 +898,30 @@ gnc_tree_view_set_sort_column (GncTreeView *view,
     GtkSortType order;
     gint model_column, current;
 
-    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
     if (!s_model)
         return;
 
-    column = gnc_tree_view_find_column_by_name(view, name);
+    column = gnc_tree_view_find_column_by_name (view, name);
     if (!column)
     {
-        gtk_tree_sortable_set_sort_column_id(
+        gtk_tree_sortable_set_sort_column_id (
             GTK_TREE_SORTABLE(s_model), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
             GTK_SORT_ASCENDING);
         return;
     }
 
     model_column =
-        GPOINTER_TO_INT(g_object_get_data(G_OBJECT(column), MODEL_COLUMN));
+        GPOINTER_TO_INT(g_object_get_data (G_OBJECT(column), MODEL_COLUMN));
     if (model_column == GNC_TREE_VIEW_COLUMN_DATA_NONE)
         return;
 
-    if (!gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(s_model),
-            &current, &order))
+    if (!gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE(s_model),
+                                               &current, &order))
         order = GTK_SORT_ASCENDING;
 
-    gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(s_model),
-                                         model_column, order);
+    gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(s_model),
+                                          model_column, order);
     DEBUG("sort column set to %s", name);
 }
 
@@ -953,23 +952,23 @@ gnc_tree_view_set_column_order (GncTreeView *view,
     columns = NULL;
     for (idx = 0; idx < length; idx++)
     {
-        const gchar *name = column_names[idx];
-        column = gnc_tree_view_find_column_by_name(view, name);
+        const gchar *name = column_names [idx];
+        column = gnc_tree_view_find_column_by_name (view, name);
         if (!column)
             continue;
-        columns = g_slist_append(columns, column);
+        columns = g_slist_append (columns, column);
     }
 
     /* Then reorder the columns */
-    for (prev = NULL, tmp = columns; tmp; tmp = g_slist_next(tmp))
+    for (prev = NULL, tmp = columns; tmp; tmp = g_slist_next (tmp))
     {
         column = tmp->data;
-        gtk_tree_view_move_column_after(GTK_TREE_VIEW(view), column, prev);
+        gtk_tree_view_move_column_after (GTK_TREE_VIEW(view), column, prev);
         prev = column;
     }
 
     /* Clean up */
-    g_slist_free(columns);
+    g_slist_free (columns);
     LEAVE("column order set");
 }
 
@@ -981,7 +980,7 @@ gnc_tree_view_set_column_order (GncTreeView *view,
  *  @param view The tree view.
  */
 
-void gnc_tree_view_remove_state_information(GncTreeView *view)
+void gnc_tree_view_remove_state_information (GncTreeView *view)
 {
     GncTreeViewPrivate *priv;
     GKeyFile *state_file = gnc_state_get_current ();
@@ -995,7 +994,7 @@ void gnc_tree_view_remove_state_information(GncTreeView *view)
     }
 
     g_key_file_remove_group (state_file, priv->state_section, NULL);
-    g_free(priv->state_section);
+    g_free (priv->state_section);
     priv->state_section = NULL;
     LEAVE(" ");
 }
@@ -1014,7 +1013,7 @@ gnc_tree_view_set_state_section (GncTreeView *view,
     GncTreeViewPrivate *priv;
     GKeyFile *state_file;
 
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER("view %p, section %s", view, section);
 
@@ -1031,7 +1030,7 @@ gnc_tree_view_set_state_section (GncTreeView *view,
     }
 
     /* Catch changes in state. Propagate to view. */
-    priv->state_section = g_strdup(section);
+    priv->state_section = g_strdup (section);
 
     state_file = gnc_state_get_current ();
     if (g_key_file_has_group (state_file, priv->state_section))
@@ -1055,7 +1054,7 @@ gnc_tree_view_set_state_section (GncTreeView *view,
             {
                 gsize length;
                 gchar **columns = g_key_file_get_string_list (state_file, priv->state_section,
-                                  key, &length, NULL);
+                                                              key, &length, NULL);
                 gnc_tree_view_set_column_order (view, columns, length);
                 g_strfreev (columns);
             }
@@ -1104,7 +1103,7 @@ gnc_tree_view_set_state_section (GncTreeView *view,
                 }
             }
         }
-        g_strfreev(keys);
+        g_strfreev (keys);
     }
 
     /* Rebuild the column visibility menu */
@@ -1123,7 +1122,7 @@ gnc_tree_view_get_state_section (GncTreeView *view)
 {
     GncTreeViewPrivate *priv;
 
-    g_return_val_if_fail (GNC_IS_TREE_VIEW (view), NULL);
+    g_return_val_if_fail (GNC_IS_TREE_VIEW(view), NULL);
 
     priv = GNC_TREE_VIEW_GET_PRIVATE (view);
     return priv->state_section;
@@ -1135,7 +1134,7 @@ void gnc_tree_view_save_state (GncTreeView *view)
 
     ENTER("view %p", view);
     g_return_if_fail (view != NULL);
-    g_return_if_fail (GNC_IS_TREE_VIEW (view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
 
@@ -1172,16 +1171,16 @@ void gnc_tree_view_save_state (GncTreeView *view)
 
 
         // ENTER("view %p, wanted %s", view, wanted);
-        column_list = gtk_tree_view_get_columns (GTK_TREE_VIEW (view));
+        column_list = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
         for (tmp = column_list; tmp; tmp = g_list_next (tmp))
         {
             GtkTreeViewColumn *column = tmp->data;
             gchar *key=NULL;
-            const gchar *name = g_object_get_data (G_OBJECT (column), PREF_NAME);
+            const gchar *name = g_object_get_data (G_OBJECT(column), PREF_NAME);
             if (!name)
                 continue;
 
-            if (!g_object_get_data (G_OBJECT (column), ALWAYS_VISIBLE))
+            if (!g_object_get_data (G_OBJECT(column), ALWAYS_VISIBLE))
             {
                 key = g_strjoin ("_", name, STATE_KEY_SUFF_VISIBLE, NULL);
                 g_key_file_set_boolean (state_file, priv->state_section, key,
@@ -1201,7 +1200,7 @@ void gnc_tree_view_save_state (GncTreeView *view)
                 g_key_file_remove_key (state_file, priv->state_section, key, NULL);
             g_free (key);
         }
-        g_list_free(column_list);
+        g_list_free (column_list);
     }
 
     LEAVE(" ");
@@ -1250,7 +1249,7 @@ gnc_tree_view_create_menu_item (GtkTreeViewColumn *column,
         return;
     }
 
-    pref_name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+    pref_name = g_object_get_data (G_OBJECT(column), PREF_NAME);
     if (!pref_name)
     {
         // LEAVE("column has no pref_name");
@@ -1261,29 +1260,29 @@ gnc_tree_view_create_menu_item (GtkTreeViewColumn *column,
     if (!priv->column_menu)
     {
         priv->column_menu = gtk_menu_new();
-        g_object_ref_sink(priv->column_menu);
+        g_object_ref_sink (priv->column_menu);
     }
 
     /* Create the check menu item */
-    column_name = g_object_get_data(G_OBJECT(column), REAL_TITLE);
+    column_name = g_object_get_data (G_OBJECT(column), REAL_TITLE);
     if (!column_name)
-        column_name = gtk_tree_view_column_get_title(column);
-    widget = gtk_check_menu_item_new_with_label(column_name);
-    gtk_menu_shell_append(GTK_MENU_SHELL(priv->column_menu), widget);
+        column_name = gtk_tree_view_column_get_title (column);
+    widget = gtk_check_menu_item_new_with_label (column_name);
+    gtk_menu_shell_append (GTK_MENU_SHELL(priv->column_menu), widget);
 
     /* Should never be able to hide the first column */
-    if (g_object_get_data(G_OBJECT(column), ALWAYS_VISIBLE))
+    if (g_object_get_data (G_OBJECT(column), ALWAYS_VISIBLE))
     {
-        g_object_set_data(G_OBJECT(widget), ALWAYS_VISIBLE, GINT_TO_POINTER(1));
-        gtk_widget_set_sensitive(widget, FALSE);
+        g_object_set_data (G_OBJECT(widget), ALWAYS_VISIBLE, GINT_TO_POINTER(1));
+        gtk_widget_set_sensitive (widget, FALSE);
     }
 
-    binding = g_object_bind_property (G_OBJECT (widget), "active", G_OBJECT (column), "visible", 0);
-    g_object_set_data (G_OBJECT (widget), "column-binding", binding);
+    binding = g_object_bind_property (G_OBJECT(widget), "active", G_OBJECT(column), "visible", 0);
+    g_object_set_data (G_OBJECT(widget), "column-binding", binding);
 
     /* Store data on the widget for callbacks */
-    key = g_strdup_printf("%s_%s", pref_name, STATE_KEY_SUFF_VISIBLE);
-    g_object_set_data_full(G_OBJECT(widget), STATE_KEY, key, g_free);
+    key = g_strdup_printf ("%s_%s", pref_name, STATE_KEY_SUFF_VISIBLE);
+    g_object_set_data_full (G_OBJECT(widget), STATE_KEY, key, g_free);
     // LEAVE(" ");
 }
 
@@ -1304,7 +1303,7 @@ gnc_tree_view_build_column_menu (GncTreeView *view)
     GncTreeViewPrivate *priv;
     GList *column_list;
 
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER("view %p", view);
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
@@ -1312,7 +1311,7 @@ gnc_tree_view_build_column_menu (GncTreeView *view)
     /* Destroy any old menu */
     if (priv->column_menu)
     {
-        g_object_unref(priv->column_menu);
+        g_object_unref (priv->column_menu);
         priv->column_menu = NULL;
     }
 
@@ -1320,18 +1319,18 @@ gnc_tree_view_build_column_menu (GncTreeView *view)
     {
         /* Show the menu popup button */
         if (priv->column_menu_column)
-            gtk_tree_view_column_set_visible(priv->column_menu_column, TRUE);
+            gtk_tree_view_column_set_visible (priv->column_menu_column, TRUE);
 
         /* Now build a new menu */
-        column_list = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-        g_list_foreach(column_list, (GFunc)gnc_tree_view_create_menu_item, view);
-        g_list_free(column_list);
+        column_list = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
+        g_list_foreach (column_list, (GFunc)gnc_tree_view_create_menu_item, view);
+        g_list_free (column_list);
     }
     else
     {
         /* Hide the menu popup button */
         if (priv->column_menu_column)
-            gtk_tree_view_column_set_visible(priv->column_menu_column, FALSE);
+            gtk_tree_view_column_set_visible (priv->column_menu_column, FALSE);
     }
     LEAVE("menu: show %d, section %s", priv->show_column_menu,
           priv->state_section ? priv->state_section : "(null)");
@@ -1352,22 +1351,21 @@ gnc_tree_view_update_column_menu_item (GtkCheckMenuItem *checkmenuitem,
 {
     gboolean visible;
 
-    g_return_if_fail(GTK_IS_CHECK_MENU_ITEM(checkmenuitem));
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GTK_IS_CHECK_MENU_ITEM(checkmenuitem));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
-    if (g_object_get_data(G_OBJECT(checkmenuitem), ALWAYS_VISIBLE))
+    if (g_object_get_data (G_OBJECT(checkmenuitem), ALWAYS_VISIBLE))
     {
         visible = TRUE;
     }
     else
     {
-        GBinding *binding = g_object_get_data (G_OBJECT (checkmenuitem), "column-binding");
+        GBinding *binding = g_object_get_data (G_OBJECT(checkmenuitem), "column-binding");
         GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(g_binding_get_target (binding));
 
         visible = gtk_tree_view_column_get_visible (column);
     }
-
-    gtk_check_menu_item_set_active(checkmenuitem, visible);
+    gtk_check_menu_item_set_active (checkmenuitem, visible);
 }
 
 /** This function when the user clicks on the button to show the
@@ -1389,8 +1387,8 @@ gnc_tree_view_select_column_cb (GtkTreeViewColumn *column,
     GncTreeViewPrivate *priv;
     GtkWidget *menu;
 
-    g_return_if_fail(GTK_IS_TREE_VIEW_COLUMN(column));
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN(column));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     menu = priv->column_menu;
@@ -1398,19 +1396,19 @@ gnc_tree_view_select_column_cb (GtkTreeViewColumn *column,
         return;
 
     /* Synchronize the menu before display */
-    gtk_container_foreach(GTK_CONTAINER(menu),
-                          (GtkCallback)gnc_tree_view_update_column_menu_item,
-                          view);
+    gtk_container_foreach (GTK_CONTAINER(menu),
+                           (GtkCallback)gnc_tree_view_update_column_menu_item,
+                           view);
 
     /* Ensure all components are visible */
-    gtk_widget_show_all(menu);
+    gtk_widget_show_all (menu);
 
     /* Pop the menu up at the button */
 #if GTK_CHECK_VERSION(3,22,0)
     gtk_menu_popup_at_pointer (GTK_MENU(priv->column_menu), NULL);
 #else
-    gtk_menu_popup(GTK_MENU(priv->column_menu), NULL, GTK_WIDGET(menu),
-                   NULL, NULL, 0, gtk_get_current_event_time());
+    gtk_menu_popup (GTK_MENU(priv->column_menu), NULL, GTK_WIDGET(menu),
+                    NULL, NULL, 0, gtk_get_current_event_time ());
 #endif
 }
 
@@ -1426,31 +1424,31 @@ void gnc_tree_view_expand_columns (GncTreeView *view,
     gchar *name, *pref_name;
     va_list args;
 
-    g_return_if_fail (GNC_IS_TREE_VIEW (view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
     ENTER(" ");
     va_start (args, first_column_name);
-    priv = GNC_TREE_VIEW_GET_PRIVATE (view);
+    priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     name = first_column_name;
     hide_spacer = FALSE;
 
     /* First disable the expand property on all (non-infrastructure) columns. */
-    columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-    for (tmp = columns; tmp; tmp = g_list_next(tmp))
+    columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
+    for (tmp = columns; tmp; tmp = g_list_next (tmp))
     {
         column = tmp->data;
-        pref_name = g_object_get_data(G_OBJECT(column), PREF_NAME);
+        pref_name = g_object_get_data (G_OBJECT(column), PREF_NAME);
         if (pref_name != NULL)
-            gtk_tree_view_column_set_expand(column, FALSE);
+            gtk_tree_view_column_set_expand (column, FALSE);
     }
     g_list_free(columns);
 
     /* Now enable it on the requested columns. */
     while (name != NULL)
     {
-        column = gnc_tree_view_find_column_by_name(view, name);
+        column = gnc_tree_view_find_column_by_name (view, name);
         if (column != NULL)
         {
-            gtk_tree_view_column_set_expand(column, TRUE);
+            gtk_tree_view_column_set_expand (column, TRUE);
             hide_spacer = TRUE;
         }
         name = va_arg (args, gchar*);
@@ -1464,13 +1462,14 @@ void gnc_tree_view_expand_columns (GncTreeView *view,
 /* Links the cell backgrounds of the two control columns to the model or
    cell data function */
 static void
-update_control_cell_renderers_background (GncTreeView *view, GtkTreeViewColumn *col, gint column, GtkTreeCellDataFunc func )
+update_control_cell_renderers_background (GncTreeView *view, GtkTreeViewColumn *col,
+                                          gint column, GtkTreeCellDataFunc func )
 {
     GList *renderers;
     GtkCellRenderer *cell;
     GList *node;
 
-    renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (col));
+    renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(col));
 
     /* Update the cell background in the list of renderers */
     for (node = renderers; node; node = node->next)
@@ -1492,10 +1491,10 @@ gnc_tree_view_set_control_column_background (GncTreeView *view, gint column, Gtk
 {
     GncTreeViewPrivate *priv;
 
-    g_return_if_fail (GNC_IS_TREE_VIEW (view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER("view %p, column %d, func %p", view, column, func);
-    priv = GNC_TREE_VIEW_GET_PRIVATE (view);
+    priv = GNC_TREE_VIEW_GET_PRIVATE(view);
 
     update_control_cell_renderers_background (view, priv->column_menu_column, column, func);
 
@@ -1510,10 +1509,10 @@ gnc_tree_view_set_sort_user_data (GncTreeView *view, GtkTreeModel *s_model)
 {
     GncTreeViewPrivate *priv;
 
-    g_return_if_fail (GNC_IS_TREE_VIEW (view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER("view %p, sort_model %p", view, s_model);
-    priv = GNC_TREE_VIEW_GET_PRIVATE (view);
+    priv = GNC_TREE_VIEW_GET_PRIVATE(view);
 
     priv->sort_model = s_model;
     LEAVE(" ");
@@ -1532,12 +1531,12 @@ gnc_tree_view_set_show_column_menu (GncTreeView *view,
 {
     GncTreeViewPrivate *priv;
 
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER("view %p, show menu %d", view, visible);
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     priv->show_column_menu = visible;
-    gnc_tree_view_build_column_menu(view);
+    gnc_tree_view_build_column_menu (view);
     LEAVE(" ");
 }
 
@@ -1552,10 +1551,10 @@ gnc_tree_view_get_show_column_menu (GncTreeView *view)
 {
     GncTreeViewPrivate *priv;
 
-    g_return_val_if_fail(GNC_IS_TREE_VIEW(view), FALSE);
+    g_return_val_if_fail (GNC_IS_TREE_VIEW(view), FALSE);
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
-    return(priv->show_column_menu);
+    return (priv->show_column_menu);
 }
 
 /** @} */
@@ -1565,21 +1564,21 @@ gnc_tree_view_get_show_column_menu (GncTreeView *view)
 /************************************************************/
 
 static gint
-gnc_tree_view_count_visible_columns(GncTreeView *view)
+gnc_tree_view_count_visible_columns (GncTreeView *view)
 {
     GList *columns, *node;
     gint count = 0;
 
-    columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
+    columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
     for (node = columns; node; node = node->next)
     {
         GtkTreeViewColumn *col = GTK_TREE_VIEW_COLUMN(node->data);
 
-        if (g_object_get_data(G_OBJECT(col), DEFAULT_VISIBLE) ||
-                g_object_get_data(G_OBJECT(col), ALWAYS_VISIBLE))
+        if (g_object_get_data (G_OBJECT(col), DEFAULT_VISIBLE) ||
+                g_object_get_data (G_OBJECT(col), ALWAYS_VISIBLE))
             count++;
     }
-    g_list_free(columns);
+    g_list_free (columns);
     return count;
 }
 
@@ -1591,14 +1590,14 @@ gnc_tree_view_configure_columns (GncTreeView *view)
     GList *columns;
     gboolean hide_menu_column;
 
-    g_return_if_fail(GNC_IS_TREE_VIEW(view));
+    g_return_if_fail (GNC_IS_TREE_VIEW(view));
 
     ENTER(" ");
 
     /* Update the view and saved state */
-    columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-    g_list_foreach(columns, (GFunc)gnc_tree_view_update_visibility, view);
-    g_list_free(columns);
+    columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
+    g_list_foreach (columns, (GFunc)gnc_tree_view_update_visibility, view);
+    g_list_free (columns);
 
     priv = GNC_TREE_VIEW_GET_PRIVATE(view);
     if (priv->state_section)
@@ -1606,10 +1605,10 @@ gnc_tree_view_configure_columns (GncTreeView *view)
 
     /* If only the first column is visible, hide the spacer and make that
      * column expand. */
-    hide_menu_column = (gnc_tree_view_count_visible_columns(view) == 1);
-    column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), 0);
-    gtk_tree_view_column_set_expand(column, hide_menu_column);
-    gtk_tree_view_column_set_visible(priv->column_menu_column, !hide_menu_column);
+    hide_menu_column = (gnc_tree_view_count_visible_columns (view) == 1);
+    column = gtk_tree_view_get_column (GTK_TREE_VIEW(view), 0);
+    gtk_tree_view_column_set_expand (column, hide_menu_column);
+    gtk_tree_view_column_set_visible (priv->column_menu_column, !hide_menu_column);
 
     LEAVE(" ");
 }
@@ -1660,29 +1659,29 @@ gnc_tree_view_column_properties (GncTreeView *view,
 
     /* Set data used by other functions */
     if (pref_name)
-        g_object_set_data(G_OBJECT(column), PREF_NAME, (gpointer)pref_name);
+        g_object_set_data (G_OBJECT(column), PREF_NAME, (gpointer)pref_name);
     if (data_column == 0)
-        g_object_set_data(G_OBJECT(column), ALWAYS_VISIBLE, GINT_TO_POINTER(1));
-    g_object_set_data(G_OBJECT(column), MODEL_COLUMN,
-                      GINT_TO_POINTER(data_column));
+        g_object_set_data (G_OBJECT(column), ALWAYS_VISIBLE, GINT_TO_POINTER(1));
+    g_object_set_data (G_OBJECT(column), MODEL_COLUMN,
+                       GINT_TO_POINTER(data_column));
 
     /* Get visibility */
-    visible = gnc_tree_view_column_visible(view, NULL, pref_name);
+    visible = gnc_tree_view_column_visible (view, NULL, pref_name);
 
     /* Set column attributes (without the sizing) */
-    g_object_set(G_OBJECT(column),
-                 "visible",     visible,
-                 "resizable",   resizable && pref_name != NULL,
-                 "reorderable", pref_name != NULL,
-                 NULL);
+    g_object_set (G_OBJECT(column),
+                  "visible", visible,
+                  "resizable", resizable && pref_name != NULL,
+                  "reorderable", pref_name != NULL,
+                  NULL);
 
     /* Get width */
     if (default_width == 0)
     {
         /* Set the sizing column attributes */
-        g_object_set(G_OBJECT(column),
-                     "sizing",      GTK_TREE_VIEW_COLUMN_AUTOSIZE,
-                     NULL);
+        g_object_set (G_OBJECT(column),
+                      "sizing", GTK_TREE_VIEW_COLUMN_AUTOSIZE,
+                      NULL);
     }
     else
     {
@@ -1696,20 +1695,20 @@ gnc_tree_view_column_properties (GncTreeView *view,
             width = 10;
 
         /* Set the sizing column attributes (including fixed-width) */
-        g_object_set(G_OBJECT(column),
-                     "sizing",      GTK_TREE_VIEW_COLUMN_FIXED,
-                     "fixed-width", width,
-                     NULL);
+        g_object_set (G_OBJECT(column),
+                      "sizing", GTK_TREE_VIEW_COLUMN_FIXED,
+                      "fixed-width", width,
+                      NULL);
         /* Save the initially calculated preferred width for later
          * comparison to the actual width when saving state. Can't
          * use the "fixed-width" property for that because it changes
          * when the user resizes the column.
          */
         g_object_set_data (G_OBJECT(column),
-                     "default-width", GINT_TO_POINTER (width));
+                     "default-width", GINT_TO_POINTER(width));
     }
 
-    s_model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+    s_model = gtk_tree_view_get_model (GTK_TREE_VIEW(view));
     if (GTK_IS_TREE_SORTABLE(s_model))
     {
         gtk_tree_view_column_set_sort_column_id (column, data_column);
@@ -1739,7 +1738,7 @@ gnc_tree_view_column_properties (GncTreeView *view,
     /* Add to the column selection menu */
     if (pref_name)
     {
-        gnc_tree_view_create_menu_item(column, view);
+        gnc_tree_view_create_menu_item (column, view);
     }
 }
 
@@ -1771,7 +1770,7 @@ gnc_tree_view_add_toggle_column (GncTreeView *view,
     renderer = gtk_cell_renderer_toggle_new ();
     if (!toggle_edited_cb)
     {
-        gtk_cell_renderer_toggle_set_activatable (GTK_CELL_RENDERER_TOGGLE (renderer), FALSE);
+        gtk_cell_renderer_toggle_set_activatable (GTK_CELL_RENDERER_TOGGLE(renderer), FALSE);
     }
     column =
         gtk_tree_view_column_new_with_attributes (column_short_title,
@@ -1780,11 +1779,11 @@ gnc_tree_view_add_toggle_column (GncTreeView *view,
                 NULL);
 
     /* Add the full title to the object for menu creation */
-    g_object_set_data_full(G_OBJECT(column), REAL_TITLE,
-                           g_strdup(column_title), g_free);
+    g_object_set_data_full (G_OBJECT(column), REAL_TITLE,
+                            g_strdup(column_title), g_free);
     if (toggle_edited_cb)
-        g_signal_connect(G_OBJECT(renderer), "toggled",
-                         G_CALLBACK(toggle_edited_cb), view);
+        g_signal_connect (G_OBJECT(renderer), "toggled",
+                          G_CALLBACK(toggle_edited_cb), view);
 
     if (model_visibility_column != GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS)
         gtk_tree_view_column_add_attribute (column, renderer,
@@ -1872,14 +1871,14 @@ gnc_tree_view_add_text_column (GncTreeView *view,
     gtk_tree_view_column_pack_start (column, renderer, TRUE);
 
     /* Set up the callbacks for when editing */
-    g_signal_connect(G_OBJECT(renderer), "editing-canceled",
-                         (GCallback) renderer_editing_canceled_cb, view);
+    g_signal_connect (G_OBJECT(renderer), "editing-canceled",
+                          (GCallback)renderer_editing_canceled_cb, view);
 
-    g_signal_connect(G_OBJECT(renderer), "editing-started",
-                         (GCallback) renderer_editing_started_cb, view);
+    g_signal_connect (G_OBJECT(renderer), "editing-started",
+                          (GCallback)renderer_editing_started_cb, view);
 
-    g_signal_connect(G_OBJECT(renderer), "edited",
-                         (GCallback) renderer_edited_cb, view);
+    g_signal_connect (G_OBJECT(renderer), "edited",
+                          (GCallback)renderer_edited_cb, view);
 
     /* Set renderer attributes controlled by the model */
     if (model_data_column != GNC_TREE_VIEW_COLUMN_DATA_NONE)
@@ -1891,11 +1890,11 @@ gnc_tree_view_add_text_column (GncTreeView *view,
 
     /* Default size is the larger of the column title and the sizing text */
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), column_title);
-    pango_layout_get_pixel_size(layout, &title_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &title_width, NULL);
+    g_object_unref (layout);
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), sizing_text);
-    pango_layout_get_pixel_size(layout, &default_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &default_width, NULL);
+    g_object_unref (layout);
     default_width = MAX(default_width, title_width);
     if (default_width)
         default_width += 10; /* padding on either side */
@@ -1945,7 +1944,7 @@ gnc_tree_view_add_date_column (GncTreeView *view,
     }
 
     /* Set up a text renderer and attributes */
-    renderer = gnc_cell_renderer_date_new(TRUE);
+    renderer = gnc_cell_renderer_date_new (TRUE);
     gtk_tree_view_column_pack_start (column, renderer, TRUE);
 
     /* Set renderer attributes controlled by the model */
@@ -1958,11 +1957,11 @@ gnc_tree_view_add_date_column (GncTreeView *view,
 
     /* Default size is the larger of the column title and the sizing text */
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), column_title);
-    pango_layout_get_pixel_size(layout, &title_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &title_width, NULL);
+    g_object_unref (layout);
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), sizing_text);
-    pango_layout_get_pixel_size(layout, &default_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &default_width, NULL);
+    g_object_unref (layout);
     default_width = MAX(default_width, title_width);
     if (default_width)
         default_width += 10; /* padding on either side */
@@ -2009,11 +2008,11 @@ gnc_tree_view_add_combo_column (GncTreeView *view,
 
     /* Default size is the larger of the column title and the sizing text */
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), column_title);
-    pango_layout_get_pixel_size(layout, &title_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &title_width, NULL);
+    g_object_unref (layout);
     layout = gtk_widget_create_pango_layout (GTK_WIDGET(view), sizing_text);
-    pango_layout_get_pixel_size(layout, &default_width, NULL);
-    g_object_unref(layout);
+    pango_layout_get_pixel_size (layout, &default_width, NULL);
+    g_object_unref (layout);
     default_width = MAX(default_width, title_width);
     if (default_width)
         default_width += 10; /* padding on either side */
@@ -2024,8 +2023,8 @@ gnc_tree_view_add_combo_column (GncTreeView *view,
     /* Stuff specific to combo */
     if (combo_tree_model)
     {
-        g_object_set(G_OBJECT(renderer), "model", combo_tree_model,
-                     "text-column", combo_model_text_column, NULL);
+        g_object_set (G_OBJECT(renderer), "model", combo_tree_model,
+                      "text-column", combo_model_text_column, NULL);
     }
     /* TODO: has-entry? */
 
@@ -2034,18 +2033,18 @@ gnc_tree_view_add_combo_column (GncTreeView *view,
 }
 
 GtkCellRenderer *
-gnc_tree_view_column_get_renderer(GtkTreeViewColumn *column)
+gnc_tree_view_column_get_renderer (GtkTreeViewColumn *column)
 {
     GList *renderers;
     GtkCellRenderer *cr = NULL;
 
-    g_return_val_if_fail(GTK_TREE_VIEW_COLUMN(column), NULL);
+    g_return_val_if_fail (GTK_TREE_VIEW_COLUMN(column), NULL);
 
     /* Get the list of one renderer */
-    renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-    if (g_list_length(renderers) > 0)
+    renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(column));
+    if (g_list_length (renderers) > 0)
         cr = GTK_CELL_RENDERER(renderers->data);
-    g_list_free(renderers);
+    g_list_free (renderers);
 
     return cr;
 }
@@ -2078,11 +2077,11 @@ gnc_tree_view_add_numeric_column (GncTreeView *view,
                                             model_visibility_column,
                                             column_sort_fn);
 
-    renderer = gnc_tree_view_column_get_renderer(column);
+    renderer = gnc_tree_view_column_get_renderer (column);
 
     /* Right align the column title and data */
-    g_object_set(G_OBJECT(column), "alignment",   1.0, NULL);
-    g_object_set(G_OBJECT(renderer), "xalign",   1.0, NULL);
+    g_object_set (G_OBJECT(column), "alignment",   1.0, NULL);
+    g_object_set (G_OBJECT(renderer), "xalign",   1.0, NULL);
 
     /* Change the text color */
     if (model_color_column != GNC_TREE_VIEW_COLUMN_COLOR_NONE)
@@ -2108,9 +2107,9 @@ gnc_tree_view_append_column (GncTreeView *view,
     int n;
 
     /* There's no easy way to get this number. */
-    columns = gtk_tree_view_get_columns(GTK_TREE_VIEW(view));
-    n = g_list_length(columns);
-    g_list_free(columns);
+    columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(view));
+    n = g_list_length (columns);
+    g_list_free (columns);
 
     /* Ignore the initial column, the selection menu */
     if (n >= 1)
@@ -2119,52 +2118,52 @@ gnc_tree_view_append_column (GncTreeView *view,
 }
 
 static gboolean
-get_column_next_to(GtkTreeView *tv, GtkTreeViewColumn **col, gboolean backward)
+get_column_next_to (GtkTreeView *tv, GtkTreeViewColumn **col, gboolean backward)
 {
     GList *cols, *node;
     GtkTreeViewColumn *c = NULL;
     gint seen = 0;
     gboolean wrapped = FALSE;
 
-    cols = gtk_tree_view_get_columns(tv);
-    g_return_val_if_fail(g_list_length(cols) > 0, FALSE);
+    cols = gtk_tree_view_get_columns (tv);
+    g_return_val_if_fail (g_list_length (cols) > 0, FALSE);
 
-    node = g_list_find(cols, *col);
-    g_return_val_if_fail(node, FALSE);
+    node = g_list_find (cols, *col);
+    g_return_val_if_fail (node, FALSE);
     do
     {
         node = backward ? node->prev : node->next;
         if (!node)
         {
             wrapped = TRUE;
-            node = backward ? g_list_last(cols) : cols;
+            node = backward ? g_list_last (cols) : cols;
         }
-        c = GTK_TREE_VIEW_COLUMN(node->data);
-        if (c && gtk_tree_view_column_get_visible(c))
+        c = GTK_TREE_VIEW_COLUMN (node->data);
+        if (c && gtk_tree_view_column_get_visible (c))
             seen++;
         if (c == *col) break;
     }
     while (!seen);
 
-    g_list_free(cols);
+    g_list_free (cols);
     *col = c;
     return wrapped;
 }
 
 gboolean
-gnc_tree_view_path_is_valid(GncTreeView *view, GtkTreePath *path)
+gnc_tree_view_path_is_valid (GncTreeView *view, GtkTreePath *path)
 {
     GtkTreeView *tv = GTK_TREE_VIEW(view);
     GtkTreeModel *s_model;
     GtkTreeIter iter;
 
-    s_model = gtk_tree_view_get_model(tv);
-    return gtk_tree_model_get_iter(s_model, &iter, path);
+    s_model = gtk_tree_view_get_model (tv);
+    return gtk_tree_model_get_iter (s_model, &iter, path);
 }
 
 void
-gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
-                     GtkTreePath *path, GdkEventKey *event)
+gnc_tree_view_keynav (GncTreeView *view, GtkTreeViewColumn **col,
+                      GtkTreePath *path, GdkEventKey *event)
 {
     GtkTreeView *tv = GTK_TREE_VIEW(view);
     gint depth;
@@ -2178,35 +2177,35 @@ gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
     case GDK_KEY_ISO_Left_Tab:
     case GDK_KEY_KP_Tab:
         shifted = event->state & GDK_SHIFT_MASK;
-        if (get_column_next_to(tv, col, shifted))
+        if (get_column_next_to (tv, col, shifted))
         {
             /* This is the end (or beginning) of the line, buddy. */
-            depth = gtk_tree_path_get_depth(path);
+            depth = gtk_tree_path_get_depth (path);
             if (shifted)
             {
-                if (!gtk_tree_path_prev(path) && depth > 1)
+                if (!gtk_tree_path_prev (path) && depth > 1)
                 {
-                    gtk_tree_path_up(path);
+                    gtk_tree_path_up (path);
                 }
             }
-            else if (gtk_tree_view_row_expanded(tv, path))
+            else if (gtk_tree_view_row_expanded (tv, path))
             {
-                gtk_tree_path_down(path);
+                gtk_tree_path_down (path);
             }
             else
             {
-                gtk_tree_path_next(path);
-                if (!gnc_tree_view_path_is_valid(view, path) && depth > 2)
+                gtk_tree_path_next (path);
+                if (!gnc_tree_view_path_is_valid (view, path) && depth > 2)
                 {
-                    gtk_tree_path_prev(path);
-                    gtk_tree_path_up(path);
-                    gtk_tree_path_next(path);
+                    gtk_tree_path_prev (path);
+                    gtk_tree_path_up (path);
+                    gtk_tree_path_next (path);
                 }
-                if (!gnc_tree_view_path_is_valid(view, path) && depth > 1)
+                if (!gnc_tree_view_path_is_valid (view, path) && depth > 1)
                 {
-                    gtk_tree_path_prev(path);
-                    gtk_tree_path_up(path);
-                    gtk_tree_path_next(path);
+                    gtk_tree_path_prev (path);
+                    gtk_tree_path_up (path);
+                    gtk_tree_path_next (path);
                 }
             }
         }
@@ -2214,19 +2213,19 @@ gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
 
     case GDK_KEY_Return:
     case GDK_KEY_KP_Enter:
-        if (gtk_tree_view_row_expanded(tv, path))
+        if (gtk_tree_view_row_expanded (tv, path))
         {
-            gtk_tree_path_down(path);
+            gtk_tree_path_down (path);
         }
         else
         {
-            depth = gtk_tree_path_get_depth(path);
-            gtk_tree_path_next(path);
-            if (!gnc_tree_view_path_is_valid(view, path) && depth > 1)
+            depth = gtk_tree_path_get_depth (path);
+            gtk_tree_path_next (path);
+            if (!gnc_tree_view_path_is_valid (view, path) && depth > 1)
             {
-                gtk_tree_path_prev(path);
-                gtk_tree_path_up(path);
-                gtk_tree_path_next(path);
+                gtk_tree_path_prev (path);
+                gtk_tree_path_up (path);
+                gtk_tree_path_next (path);
             }
         }
         break;
@@ -2235,7 +2234,7 @@ gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
 }
 
 void
-gnc_tree_view_set_editing_started_cb(GncTreeView *view, GFunc editing_started_cb, gpointer editing_cb_data)
+gnc_tree_view_set_editing_started_cb (GncTreeView *view, GFunc editing_started_cb, gpointer editing_cb_data)
 {
     GncTreeViewPrivate *priv;
 
@@ -2249,7 +2248,7 @@ gnc_tree_view_set_editing_started_cb(GncTreeView *view, GFunc editing_started_cb
 }
 
 void
-gnc_tree_view_set_editing_finished_cb(GncTreeView *view, GFunc editing_finished_cb, gpointer editing_cb_data)
+gnc_tree_view_set_editing_finished_cb (GncTreeView *view, GFunc editing_finished_cb, gpointer editing_cb_data)
 {
     GncTreeViewPrivate *priv;
 
diff --git a/gnucash/gnome-utils/gnc-tree-view.h b/gnucash/gnome-utils/gnc-tree-view.h
index 9b379a490..22a6fb9a9 100644
--- a/gnucash/gnome-utils/gnc-tree-view.h
+++ b/gnucash/gnome-utils/gnc-tree-view.h
@@ -438,7 +438,7 @@ gnc_tree_view_get_show_column_menu (GncTreeView *view);
  *  @returns The cell renderer in use in the column.
  */
 GtkCellRenderer *
-gnc_tree_view_column_get_renderer(GtkTreeViewColumn *column);
+gnc_tree_view_column_get_renderer (GtkTreeViewColumn *column);
 
 
 /* Takes a GdkEventKey and the current path and column for the
@@ -446,26 +446,26 @@ gnc_tree_view_column_get_renderer(GtkTreeViewColumn *column);
  * cursor.  Returns the new column and the possibly changed (if
  * navigation wrapped a row) path. */
 void
-gnc_tree_view_keynav(GncTreeView *view, GtkTreeViewColumn **col,
-                     GtkTreePath *path, GdkEventKey *event);
+gnc_tree_view_keynav (GncTreeView *view, GtkTreeViewColumn **col,
+                      GtkTreePath *path, GdkEventKey *event);
 
 /* Returns TRUE if path is a vaid path for the treeview */
 gboolean
-gnc_tree_view_path_is_valid(GncTreeView *view, GtkTreePath *path);
+gnc_tree_view_path_is_valid (GncTreeView *view, GtkTreePath *path);
 
 /** Setup a callback for when the user starts editing so appropiate actions can be taken
  *  like disable the actions delete menu option.
  */
 void
-gnc_tree_view_set_editing_started_cb(GncTreeView *view,
-                    GFunc editing_started_cb, gpointer editing_cb_data);
+gnc_tree_view_set_editing_started_cb (GncTreeView *view,
+                     GFunc editing_started_cb, gpointer editing_cb_data);
 
 /** Setup a callback for when the user finishes editing so appropiate actions can be taken
  *  like enable the actions delete menu option.
  */
 void
-gnc_tree_view_set_editing_finished_cb(GncTreeView *view,
-                   GFunc editing_finished_cb, gpointer editing_cb_data);
+gnc_tree_view_set_editing_finished_cb (GncTreeView *view,
+                    GFunc editing_finished_cb, gpointer editing_cb_data);
 
 /** @} */
 

commit 33223970916e711146d7a4182fd5f6cd6912542d
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Aug 20 14:45:33 2019 +0100

    Restrict where you can click on the menu column header
    
    With the previous change clicking any where on the menu column header
    will activate the menu so this change activates the menu only in the
    area of the icon.

diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index f29adf10a..9ee151aac 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -106,12 +106,11 @@ static gchar **gnc_tree_view_get_column_order (GncTreeView *view,
 
 typedef struct GncTreeViewPrivate
 {
-    GtkTreeViewColumn *selection_column;
-
     /* Column selection menu related values */
     GtkTreeViewColumn *column_menu_column;
     GtkWidget         *column_menu;
     gboolean           show_column_menu;
+    GtkWidget         *column_menu_icon_box;
 
     /* Sort callback model */
     GtkTreeModel      *sort_model;
@@ -197,6 +196,36 @@ gnc_tree_view_update_grid_lines (gpointer prefs, gchar* pref, gpointer user_data
     gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(view), gnc_tree_view_get_grid_lines_pref ());
 }
 
+static gboolean
+gnc_tree_view_select_column_icon_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+    GncTreeView *view = user_data;
+    GncTreeViewPrivate *priv;
+    GtkStyleContext *stylectxt = gtk_widget_get_style_context (widget);
+    GtkBorder padding;
+
+    // if the event button is not the right one, leave.
+    if (event->button != 1)
+        return FALSE;
+
+    priv = GNC_TREE_VIEW_GET_PRIVATE(view);
+
+    gtk_style_context_get_padding (stylectxt, GTK_STATE_FLAG_NORMAL, &padding);
+
+    if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+    {
+        if (event->x < (gtk_widget_get_allocated_width (priv->column_menu_icon_box) + padding.left))
+            gnc_tree_view_select_column_cb (priv->column_menu_column, view);
+    }
+    else
+    {
+        if (event->x > (gtk_widget_get_allocated_width (widget) -
+                       (gtk_widget_get_allocated_width (priv->column_menu_icon_box) + padding.right)))
+            gnc_tree_view_select_column_cb (priv->column_menu_column, view);
+    }
+    return FALSE;
+}
+
 /** Initialize a new instance of a base gnucash tree view.  This
  *  function allocates and initializes the object private storage
  *  space.  It also adds the new object to a list (for memory tracking
@@ -211,8 +240,7 @@ gnc_tree_view_init (GncTreeView *view, void *data)
 {
     GncTreeViewPrivate *priv;
     GtkTreeViewColumn *column;
-    GtkWidget *icon;
-    GtkRequisition requisition;
+    GtkWidget *sep, *icon;
 
     GncTreeViewClass *klass = (GncTreeViewClass*)data;
 
@@ -247,25 +275,62 @@ gnc_tree_view_init (GncTreeView *view, void *data)
      * widget.  gnc_tree_view_add_text_column will do most of the
      * work. */
     icon = gtk_image_new_from_icon_name ("go-down", GTK_ICON_SIZE_SMALL_TOOLBAR);
-    gtk_widget_show(icon);
+
+    priv->column_menu_icon_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_box_set_homogeneous (GTK_BOX(priv->column_menu_icon_box), FALSE);
+
+#if GTK_CHECK_VERSION(3,12,0)
+    gtk_widget_set_margin_start (GTK_WIDGET(icon), 5);
+#else
+    gtk_widget_set_margin_left (GTK_WIDGET(icon), 5);
+#endif
+    gtk_box_pack_end (GTK_BOX (priv->column_menu_icon_box), icon, FALSE, FALSE, 0);
+
+    sep = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+    gtk_box_pack_end (GTK_BOX (priv->column_menu_icon_box), sep, FALSE, FALSE, 0);
+
+    gtk_widget_show_all (priv->column_menu_icon_box);
 
     g_signal_connect (G_OBJECT (icon), "draw",
                       G_CALLBACK (gnc_draw_arrow_cb), GINT_TO_POINTER(1));
 
-    gtk_widget_get_preferred_size(icon, &requisition, NULL);
     column = gnc_tree_view_add_text_column (view, NULL, NULL, NULL, NULL,
                                             -1, -1, NULL);
     g_object_set(G_OBJECT(column),
                  "clickable", TRUE,
-                 "widget", icon,
+                 "widget", priv->column_menu_icon_box,
                  "alignment", 1.0,
+                 "expand", TRUE,
                  (gchar *)NULL);
-    priv->selection_column = column;
-    g_signal_connect(G_OBJECT(column), "clicked",
-                     G_CALLBACK (gnc_tree_view_select_column_cb),
-                     view);
+
     priv->column_menu_column = column;
 
+    // get the actual column button by looking at the parents of the column_menu_icon
+    {
+        GtkWidget *mybox = gtk_widget_get_parent (icon);
+        GtkWidget *walign = gtk_widget_get_parent (mybox);
+        GtkWidget *box = gtk_widget_get_parent (walign);
+        GtkWidget *button = gtk_widget_get_parent (box);
+
+        if (!GTK_IS_BUTTON(button)) // just in case this order changes.
+        {
+            // this will fire for the whole column header
+            g_signal_connect (G_OBJECT(column), "clicked",
+                              G_CALLBACK (gnc_tree_view_select_column_cb),
+                              view);
+        }
+        else
+        {
+            /* this part will restrict the mouse click to just where the
+               icon is, tried using an eventbox but it would only work
+               some of the time */
+            gtk_widget_set_events (button, GDK_BUTTON_PRESS_MASK);
+
+            g_signal_connect (G_OBJECT(button), "button_press_event",
+                              G_CALLBACK (gnc_tree_view_select_column_icon_cb),
+                              view);
+        }
+    }
     gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 }
 
@@ -1432,7 +1497,7 @@ gnc_tree_view_set_control_column_background (GncTreeView *view, gint column, Gtk
     ENTER("view %p, column %d, func %p", view, column, func);
     priv = GNC_TREE_VIEW_GET_PRIVATE (view);
 
-    update_control_cell_renderers_background (view, priv->selection_column, column, func);
+    update_control_cell_renderers_background (view, priv->column_menu_column, column, func);
 
     LEAVE(" ");
 }
@@ -1524,7 +1589,7 @@ gnc_tree_view_configure_columns (GncTreeView *view)
     GncTreeViewPrivate *priv;
     GtkTreeViewColumn *column;
     GList *columns;
-    gboolean hide_spacer;
+    gboolean hide_menu_column;
 
     g_return_if_fail(GNC_IS_TREE_VIEW(view));
 
@@ -1541,10 +1606,10 @@ gnc_tree_view_configure_columns (GncTreeView *view)
 
     /* If only the first column is visible, hide the spacer and make that
      * column expand. */
-    hide_spacer = (gnc_tree_view_count_visible_columns(view) == 1);
+    hide_menu_column = (gnc_tree_view_count_visible_columns(view) == 1);
     column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), 0);
-    gtk_tree_view_column_set_expand(column, hide_spacer);
-    gtk_tree_view_column_set_visible(priv->selection_column, !hide_spacer);
+    gtk_tree_view_column_set_expand(column, hide_menu_column);
+    gtk_tree_view_column_set_visible(priv->column_menu_column, !hide_menu_column);
 
     LEAVE(" ");
 }

commit 5384f319433c99e490f7641e3cbee05eabc0b633
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Tue Aug 20 10:45:58 2019 +0100

    Stop Gtk Warning Negative content width
    
    This is caused by the spacer column being reduced as new columns are
    inserted before the menu selection column at the end. When it gets to
    a size that can not hold a valid button in the header you get the
    warning so remove the spacer column.

diff --git a/gnucash/gnome-utils/gnc-tree-view.c b/gnucash/gnome-utils/gnc-tree-view.c
index 6498c91f4..f29adf10a 100644
--- a/gnucash/gnome-utils/gnc-tree-view.c
+++ b/gnucash/gnome-utils/gnc-tree-view.c
@@ -106,8 +106,6 @@ static gchar **gnc_tree_view_get_column_order (GncTreeView *view,
 
 typedef struct GncTreeViewPrivate
 {
-    /*  Spacer column */
-    GtkTreeViewColumn *spacer_column;
     GtkTreeViewColumn *selection_column;
 
     /* Column selection menu related values */
@@ -238,19 +236,6 @@ gnc_tree_view_init (GncTreeView *view, void *data)
     gtk_tree_view_set_column_drag_function(GTK_TREE_VIEW(view),
                                            gnc_tree_view_drop_ok_cb, NULL, NULL);
 
-    /* Create the next to last column which is always present, visible,
-     * and empty. Override the defaults and make this a one pixel wide
-     * column, but have it take up any extra space in the window. */
-    column = gnc_tree_view_add_text_column (view, NULL, NULL, NULL, NULL,
-                                            -1, -1, NULL);
-    g_object_set(G_OBJECT(column),
-                 "fixed-width", 1,
-                 "expand", TRUE,
-                 (gchar *)NULL);
-    priv->spacer_column = column;
-
-    gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-
     // Set grid lines option to preference
     gtk_tree_view_set_grid_lines (GTK_TREE_VIEW(view), gnc_tree_view_get_grid_lines_pref ());
     gnc_prefs_register_cb (GNC_PREFS_GROUP_GENERAL, GNC_PREF_GRID_LINES_HORIZONTAL,
@@ -273,7 +258,7 @@ gnc_tree_view_init (GncTreeView *view, void *data)
     g_object_set(G_OBJECT(column),
                  "clickable", TRUE,
                  "widget", icon,
-                 "fixed-width", requisition.width + 10,
+                 "alignment", 1.0,
                  (gchar *)NULL);
     priv->selection_column = column;
     g_signal_connect(G_OBJECT(column), "clicked",
@@ -1407,8 +1392,6 @@ void gnc_tree_view_expand_columns (GncTreeView *view,
     }
     va_end (args);
 
-    gtk_tree_view_column_set_visible (priv->spacer_column, !hide_spacer);
-
     LEAVE(" ");
 }
 
@@ -1449,7 +1432,6 @@ gnc_tree_view_set_control_column_background (GncTreeView *view, gint column, Gtk
     ENTER("view %p, column %d, func %p", view, column, func);
     priv = GNC_TREE_VIEW_GET_PRIVATE (view);
 
-    update_control_cell_renderers_background (view, priv->spacer_column, column, func);
     update_control_cell_renderers_background (view, priv->selection_column, column, func);
 
     LEAVE(" ");
@@ -1562,7 +1544,6 @@ gnc_tree_view_configure_columns (GncTreeView *view)
     hide_spacer = (gnc_tree_view_count_visible_columns(view) == 1);
     column = gtk_tree_view_get_column(GTK_TREE_VIEW(view), 0);
     gtk_tree_view_column_set_expand(column, hide_spacer);
-    gtk_tree_view_column_set_visible(priv->spacer_column, !hide_spacer);
     gtk_tree_view_column_set_visible(priv->selection_column, !hide_spacer);
 
     LEAVE(" ");
@@ -2066,9 +2047,9 @@ gnc_tree_view_append_column (GncTreeView *view,
     n = g_list_length(columns);
     g_list_free(columns);
 
-    /* Ignore the initial two columns (the spacer and the selection menu) */
-    if (n >= 2)
-        n -= 2;
+    /* Ignore the initial column, the selection menu */
+    if (n >= 1)
+        n -= 1;
     return gtk_tree_view_insert_column (GTK_TREE_VIEW(view), column, n);
 }
 

commit ce638f3084abc26d45b3bf0ba7417c31346e5689
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Fri Aug 23 10:06:15 2019 +0200

    Add OARS classification to our appdata file
    
    It mentions mild for social-info because we use an online api for quotes retrieval.

diff --git a/gnucash/gnome/gnucash.appdata.xml.in b/gnucash/gnome/gnucash.appdata.xml.in
index 81aa28ade..cfd6f19c9 100644
--- a/gnucash/gnome/gnucash.appdata.xml.in
+++ b/gnucash/gnome/gnucash.appdata.xml.in
@@ -29,6 +29,9 @@
   <categories>
     <category>Finance</category>
   </categories>
+  <content_rating type="oars-1.1">
+    <content_attribute id="social-info">mild</content_attribute>
+  </content_rating>
   <screenshots>
     <screenshot type="default">
       <image type="source" width="1049" height="590">https://www.gnucash.org/images/features/feature_accounts_lg.png</image>



Summary of changes:
 CMakeLists.txt                                     |   7 +
 cmake/CMakeLists.txt                               |   5 +-
 cmake/configure-appdata.cmake                      |  16 +
 cmake/configure-manpage.cmake                      |  17 +
 cmake/git2version-info.cmake                       |  28 +
 cmake/version-info2env.cmake                       |  13 +
 data/accounts/CMakeLists.txt                       |   3 +-
 data/accounts/{pl => he}/CMakeLists.txt            |   9 +-
 data/accounts/he/acctchrt_brokerage.gnucash-xea    | 432 +++++++++++++++
 .../{C => he}/acctchrt_business.gnucash-xea        | 306 +++++------
 .../{ja => he}/acctchrt_carloan.gnucash-xea        |  30 +-
 .../{C => he}/acctchrt_cdmoneymkt.gnucash-xea      |  38 +-
 .../{ja => he}/acctchrt_checkbook.gnucash-xea      |  34 +-
 .../{C => he}/acctchrt_childcare.gnucash-xea       |  14 +-
 .../accounts/{C => he}/acctchrt_common.gnucash-xea | 258 ++++-----
 .../{ja => he}/acctchrt_eduloan.gnucash-xea        |  30 +-
 .../{C => he}/acctchrt_fixedassets.gnucash-xea     |  26 +-
 data/accounts/{C => he}/acctchrt_full.gnucash-xea  | 466 ++++++++--------
 .../{C => he}/acctchrt_homeloan.gnucash-xea        |  30 +-
 .../{ja => he}/acctchrt_homeown.gnucash-xea        |  30 +-
 .../{ja => he}/acctchrt_otherloan.gnucash-xea      |  30 +-
 .../{ja => he}/acctchrt_renter.gnucash-xea         |  22 +-
 .../{C => he}/acctchrt_retiremt.gnucash-xea        |  38 +-
 .../{ja => he}/acctchrt_spouseinc.gnucash-xea      |  42 +-
 .../acctchrt_spouseretire.gnucash-xea}             |  38 +-
 doc/CMakeLists.txt                                 |  26 +-
 doc/gnucash.1.in                                   |   2 +-
 gnucash/gnome-utils/gnc-tree-view.c                | 605 +++++++++++----------
 gnucash/gnome-utils/gnc-tree-view.h                |  16 +-
 gnucash/gnome/CMakeLists.txt                       |  25 +-
 gnucash/gnome/dialog-fincalc.c                     |  26 +-
 ...sh.appdata.xml.in => gnucash.appdata.xml.in.in} |  20 +-
 gnucash/gnome/gnucash.desktop.in.in                |   2 +-
 gnucash/gtkbuilder/dialog-fincalc.glade            |  71 ++-
 gnucash/gtkbuilder/dialog-import.glade             |   1 +
 gnucash/import-export/import-main-matcher.c        |   9 +
 gnucash/report/reports/standard/register.scm       | 119 ++--
 .../report/reports/standard/test/test-register.scm | 100 ++--
 libgnucash/core-utils/CMakeLists.txt               |  49 +-
 libgnucash/engine/gnc-numeric.cpp                  |   9 +-
 libgnucash/engine/test/gtest-gnc-numeric.cpp       |   6 +
 libgnucash/tax/CMakeLists.txt                      |   8 +-
 libgnucash/tax/de_DE/txf.scm                       |  79 +--
 libgnucash/tax/us/txf.scm                          |  74 +--
 po/CMakeLists.txt                                  |   2 +-
 po/POTFILES.in                                     |   2 +-
 po/fa.po                                           |  19 +-
 47 files changed, 1899 insertions(+), 1333 deletions(-)
 create mode 100644 cmake/configure-appdata.cmake
 create mode 100644 cmake/configure-manpage.cmake
 create mode 100644 cmake/git2version-info.cmake
 create mode 100644 cmake/version-info2env.cmake
 copy data/accounts/{pl => he}/CMakeLists.txt (81%)
 create mode 100644 data/accounts/he/acctchrt_brokerage.gnucash-xea
 copy data/accounts/{C => he}/acctchrt_business.gnucash-xea (84%)
 copy data/accounts/{ja => he}/acctchrt_carloan.gnucash-xea (81%)
 copy data/accounts/{C => he}/acctchrt_cdmoneymkt.gnucash-xea (81%)
 copy data/accounts/{ja => he}/acctchrt_checkbook.gnucash-xea (83%)
 copy data/accounts/{C => he}/acctchrt_childcare.gnucash-xea (86%)
 copy data/accounts/{C => he}/acctchrt_common.gnucash-xea (78%)
 copy data/accounts/{ja => he}/acctchrt_eduloan.gnucash-xea (82%)
 copy data/accounts/{C => he}/acctchrt_fixedassets.gnucash-xea (84%)
 copy data/accounts/{C => he}/acctchrt_full.gnucash-xea (77%)
 copy data/accounts/{C => he}/acctchrt_homeloan.gnucash-xea (84%)
 copy data/accounts/{ja => he}/acctchrt_homeown.gnucash-xea (83%)
 copy data/accounts/{ja => he}/acctchrt_otherloan.gnucash-xea (82%)
 copy data/accounts/{ja => he}/acctchrt_renter.gnucash-xea (84%)
 copy data/accounts/{C => he}/acctchrt_retiremt.gnucash-xea (80%)
 copy data/accounts/{ja => he}/acctchrt_spouseinc.gnucash-xea (81%)
 copy data/accounts/{C/acctchrt_retiremt.gnucash-xea => he/acctchrt_spouseretire.gnucash-xea} (79%)
 rename gnucash/gnome/{gnucash.appdata.xml.in => gnucash.appdata.xml.in.in} (87%)

