Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
  • Loading branch information
@christopherlam
christopherlam committed Sep 9, 2022
2 parents 95361ad + 6d7b0cc commit 161b07b
Show file tree
Hide file tree
Showing 89 changed files with 53,218 additions and 52,948 deletions.
2 changes: 1 addition & 1 deletion bindings/python/example_scripts/rest-api/gnucash_rest.py
View file
Expand Up @@ -1818,7 +1818,7 @@ def gnc_numeric_from_decimal(decimal_value):
sign, digits, exponent = decimal_value.as_tuple()

# convert decimal digits to a fractional numerator
# equivlent to
# equivalent to
# numerator = int(''.join(digits))
# but without the wated conversion to string and back,
# this is probably the same algorithm int() uses
Expand Down
2 changes: 1 addition & 1 deletion bindings/python/example_scripts/simple_invoice_insert.py
View file
Expand Up @@ -58,7 +58,7 @@ def gnc_numeric_from_decimal(decimal_value):
sign, digits, exponent = decimal_value.as_tuple()

# convert decimal digits to a fractional numerator
# equivlent to
# equivalent to
# numerator = int(''.join(digits))
# but without the wated conversion to string and back,
# this is probably the same algorithm int() uses
Expand Down
8 changes: 4 additions & 4 deletions data/accounts/fr_BE/acctchrt_business.gnucash-xea
View file
Expand Up @@ -48,15 +48,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:commodity-scu>0</act:commodity-scu>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Actifs</act:name>
<act:name>Actif</act:name>
<act:id type="new">4f40ddce996f8f74b4e99f52e275ba14</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actifs</act:description>
<act:description>Actif</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down Expand Up @@ -1356,15 +1356,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Solde</act:name>
<act:name>Capitaux propres</act:name>
<act:id type="new">87e02e757b32b3059652cfe09fe9ae00</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Solde</act:description>
<act:description>Capitaux propres</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down
8 changes: 4 additions & 4 deletions data/accounts/fr_CH/acctchrt_business.gnucash-xea
View file
Expand Up @@ -48,15 +48,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:commodity-scu>0</act:commodity-scu>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Actifs</act:name>
<act:name>Actif</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>Actifs</act:description>
<act:description>Actif</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down Expand Up @@ -1356,15 +1356,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Solde</act:name>
<act:name>Capitaux propres</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>Solde</act:description>
<act:description>Capitaux propres</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down
2 changes: 1 addition & 1 deletion data/accounts/fr_CH/acctchrt_pme-19.gnucash-xea
View file
Expand Up @@ -53,7 +53,7 @@
<act:commodity-scu>100</act:commodity-scu>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Actifs</act:name>
<act:name>Actif</act:name>
<act:id type="guid">e3f7b59890ec44688241f322db0a7392</act:id>
<act:type>ASSET</act:type>
<act:commodity>
Expand Down
8 changes: 4 additions & 4 deletions data/accounts/fr_FR/acctchrt_business.gnucash-xea
View file
Expand Up @@ -48,15 +48,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:commodity-scu>0</act:commodity-scu>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Actifs</act:name>
<act:name>Actif</act:name>
<act:id type="new">4f40ddce996f8f74b4e99f52e275ba14</act:id>
<act:type>ASSET</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Actifs</act:description>
<act:description>Actif</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down Expand Up @@ -1356,15 +1356,15 @@ Les utilisateurs gérant une entreprise sélectionneront ceci au lieu des autres
<act:parent type="new">b615fad5f752ab26809e3f1c0e788dd1</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
<act:name>Solde</act:name>
<act:name>Capitaux propres</act:name>
<act:id type="new">87e02e757b32b3059652cfe09fe9ae00</act:id>
<act:type>EQUITY</act:type>
<act:commodity>
<cmdty:space>ISO4217</cmdty:space>
<cmdty:id>EUR</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Solde</act:description>
<act:description>Capitaux propres</act:description>
<act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/taxreport.gnucash
View file
Expand Up @@ -1921,7 +1921,7 @@
<cmdty:id>USD</cmdty:id>
</act:commodity>
<act:commodity-scu>100</act:commodity-scu>
<act:description>Fertalizer, roto-tiller</act:description>
<act:description>Fertilizer, roto-tiller</act:description>
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
</gnc:account>
<gnc:account version="2.0.0">
Expand Down
8 changes: 4 additions & 4 deletions gnucash/gnome-utils/gnc-date-edit.c
View file
Expand Up @@ -296,7 +296,7 @@ gnc_date_edit_popup (GNCDateEdit *gde)
if (!date_was_valid)
{
/* No valid date. Hacky workaround: Instead of crashing we randomly choose today's date. */
gnc_tm_get_today_start(&mtm);
gnc_tm_get_today_neutral(&mtm);
}

mtm.tm_mon--;
Expand All @@ -307,7 +307,7 @@ gnc_date_edit_popup (GNCDateEdit *gde)
if (mtm.tm_year >= 1900)
mtm.tm_year -= 1900;

gnc_tm_set_day_start(&mtm);
gnc_tm_set_day_neutral(&mtm);

/* Set the calendar. */
gtk_calendar_select_day (GTK_CALENDAR (gde->calendar), 1);
Expand Down Expand Up @@ -1061,7 +1061,7 @@ gnc_date_edit_get_date_internal (GNCDateEdit *gde)
revert to today's date. Alternatively we can return some value that
signals that we don't get a valid date, but all callers of this
function will have to check this. Alas, I'm too lazy to do this here. */
gnc_tm_get_today_start(&tm);
gnc_tm_get_today_neutral(&tm);
}

tm.tm_mon--;
Expand Down Expand Up @@ -1109,7 +1109,7 @@ gnc_date_edit_get_date_internal (GNCDateEdit *gde)
}
else
{
gnc_tm_set_day_start(&tm);
gnc_tm_set_day_neutral(&tm);
}

tm.tm_isdst = -1;
Expand Down
3 changes: 2 additions & 1 deletion gnucash/gnome-utils/gnc-dense-cal.c
View file
Expand Up @@ -528,9 +528,10 @@ gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon)
static void
_gnc_dense_cal_set_month(GncDenseCal *dcal, GDateMonth mon, gboolean redraw)
{
GTimer *t = g_timer_new();
GTimer *t;
if (dcal->month == mon)
return;
t = g_timer_new();
dcal->month = mon;
g_timer_start(t);
recompute_first_of_month_offset(dcal);
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome-utils/gnc-gtk-utils.c
View file
Expand Up @@ -225,7 +225,7 @@ gnc_cbwe_require_list_item (GtkComboBox *cbwe)

/** Return whether the current gtk theme is a dark one. A theme is considered "dark" if
* it has a dark background color with a light foreground color (used for text and so on).
* We only test on the foregrond color assuming a sane theme chooses enough contrast between
* We only test on the foreground color assuming a sane theme chooses enough contrast between
* foreground and background colors.
*
* @param fg_color The foreground color to test.
Expand Down
4 changes: 2 additions & 2 deletions gnucash/gnome-utils/gnc-main-window.cpp
View file
Expand Up @@ -3040,7 +3040,7 @@ gnc_main_window_new (void)
#endif
gnc_engine_add_commit_error_callback( gnc_main_window_engine_commit_error_callback, window );

// set up a callback for noteboook navigation
// set up a callback for notebook navigation
g_signal_connect (G_OBJECT(window), "key-press-event",
G_CALLBACK(gnc_main_window_key_press_event),
NULL);
Expand Down Expand Up @@ -4939,7 +4939,7 @@ gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
g_signal_connect (dialog, "activate-link",
G_CALLBACK (url_signal_cb), nullptr);

// Add enviroment paths
// Add environment paths
add_about_paths (dialog);

/* Set dialog to resize. */
Expand Down

0 comments on commit 161b07b

Please sign in to comment.