mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge PR #1425 into maint
This commit is contained in:
commit
47fa8b281e
@ -1818,7 +1818,7 @@ def gnc_numeric_from_decimal(decimal_value):
|
|||||||
sign, digits, exponent = decimal_value.as_tuple()
|
sign, digits, exponent = decimal_value.as_tuple()
|
||||||
|
|
||||||
# convert decimal digits to a fractional numerator
|
# convert decimal digits to a fractional numerator
|
||||||
# equivlent to
|
# equivalent to
|
||||||
# numerator = int(''.join(digits))
|
# numerator = int(''.join(digits))
|
||||||
# but without the wated conversion to string and back,
|
# but without the wated conversion to string and back,
|
||||||
# this is probably the same algorithm int() uses
|
# this is probably the same algorithm int() uses
|
||||||
|
@ -58,7 +58,7 @@ def gnc_numeric_from_decimal(decimal_value):
|
|||||||
sign, digits, exponent = decimal_value.as_tuple()
|
sign, digits, exponent = decimal_value.as_tuple()
|
||||||
|
|
||||||
# convert decimal digits to a fractional numerator
|
# convert decimal digits to a fractional numerator
|
||||||
# equivlent to
|
# equivalent to
|
||||||
# numerator = int(''.join(digits))
|
# numerator = int(''.join(digits))
|
||||||
# but without the wated conversion to string and back,
|
# but without the wated conversion to string and back,
|
||||||
# this is probably the same algorithm int() uses
|
# this is probably the same algorithm int() uses
|
||||||
|
@ -1921,7 +1921,7 @@
|
|||||||
<cmdty:id>USD</cmdty:id>
|
<cmdty:id>USD</cmdty:id>
|
||||||
</act:commodity>
|
</act:commodity>
|
||||||
<act:commodity-scu>100</act:commodity-scu>
|
<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>
|
<act:parent type="guid">ce8a0ff9cfc2c79c99e6c65d5e258a55</act:parent>
|
||||||
</gnc:account>
|
</gnc:account>
|
||||||
<gnc:account version="2.0.0">
|
<gnc:account version="2.0.0">
|
||||||
|
@ -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
|
/** 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).
|
* 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.
|
* foreground and background colors.
|
||||||
*
|
*
|
||||||
* @param fg_color The foreground color to test.
|
* @param fg_color The foreground color to test.
|
||||||
|
@ -3034,7 +3034,7 @@ gnc_main_window_new (void)
|
|||||||
#endif
|
#endif
|
||||||
gnc_engine_add_commit_error_callback( gnc_main_window_engine_commit_error_callback, window );
|
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_signal_connect (G_OBJECT(window), "key-press-event",
|
||||||
G_CALLBACK(gnc_main_window_key_press_event),
|
G_CALLBACK(gnc_main_window_key_press_event),
|
||||||
NULL);
|
NULL);
|
||||||
@ -4969,7 +4969,7 @@ gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window)
|
|||||||
g_signal_connect (dialog, "activate-link",
|
g_signal_connect (dialog, "activate-link",
|
||||||
G_CALLBACK (url_signal_cb), NULL);
|
G_CALLBACK (url_signal_cb), NULL);
|
||||||
|
|
||||||
// Add enviroment paths
|
// Add environment paths
|
||||||
add_about_paths (dialog);
|
add_about_paths (dialog);
|
||||||
|
|
||||||
/* Set dialog to resize. */
|
/* Set dialog to resize. */
|
||||||
|
@ -3988,7 +3988,7 @@ gtv_sr_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
|
|||||||
if (view->priv->dirty_trans != NULL) // from a dirty trans
|
if (view->priv->dirty_trans != NULL) // from a dirty trans
|
||||||
trans_changed = TRUE;
|
trans_changed = TRUE;
|
||||||
|
|
||||||
/* Reset allow changes for reconciled transctions */
|
/* Reset allow changes for reconciled transactions */
|
||||||
view->change_allowed = FALSE;
|
view->change_allowed = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6062,7 +6062,7 @@ gnc_tree_view_split_reg_cancel_edit (GncTreeViewSplitReg *view, gboolean reg_clo
|
|||||||
split = gnc_tree_model_split_get_blank_split (model);
|
split = gnc_tree_model_split_get_blank_split (model);
|
||||||
xaccSplitReinit (split); // Clear the blank split
|
xaccSplitReinit (split); // Clear the blank split
|
||||||
}
|
}
|
||||||
/* Reset allow changes for reconciled transctions */
|
/* Reset allow changes for reconciled transactions */
|
||||||
view->change_allowed = FALSE;
|
view->change_allowed = FALSE;
|
||||||
|
|
||||||
view->priv->auto_complete = FALSE; // reset auto_complete has run flag
|
view->priv->auto_complete = FALSE; // reset auto_complete has run flag
|
||||||
|
@ -1166,7 +1166,7 @@ gnc_plugin_page_register2_create_widget (GncPluginPage *plugin_page)
|
|||||||
gnc_ppr_update_date_query (page, FALSE);
|
gnc_ppr_update_date_query (page, FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME may change, can we load filter at same time of sort so we do one querry on load
|
//FIXME may change, can we load filter at same time of sort so we do one query on load
|
||||||
gnc_ledger_display2_refresh (priv->ledger);
|
gnc_ledger_display2_refresh (priv->ledger);
|
||||||
|
|
||||||
/* This sets the default selection on load, not required for templates */
|
/* This sets the default selection on load, not required for templates */
|
||||||
|
@ -64,7 +64,7 @@
|
|||||||
</row>
|
</row>
|
||||||
<row>
|
<row>
|
||||||
<col id="0" translatable="yes" comments="Label for locale settings of formats, …">Locale</col>
|
<col id="0" translatable="yes" comments="Label for locale settings of formats, …">Locale</col>
|
||||||
<col id="1" comments="Because it will be overwritten no translation is reqired">(dummy)</col>
|
<col id="1" comments="Because it will be overwritten no translation is required">(dummy)</col>
|
||||||
</row>
|
</row>
|
||||||
</data>
|
</data>
|
||||||
</object>
|
</object>
|
||||||
|
@ -479,7 +479,7 @@ gnc_ab_get_purpose (const AB_TRANSACTION *ab_trans, gboolean is_ofx)
|
|||||||
|
|
||||||
/* Ultimate Creditor and Ultimate Debtor are newish parameters added
|
/* Ultimate Creditor and Ultimate Debtor are newish parameters added
|
||||||
* to SWIFT MT940 and CAMT.053 designating the originating
|
* to SWIFT MT940 and CAMT.053 designating the originating
|
||||||
* payer or payee on the tranaction. It's unlikely, but still
|
* payer or payee on the transaction. It's unlikely, but still
|
||||||
* possible, that a bank would use both this markup and the Non-swift
|
* possible, that a bank would use both this markup and the Non-swift
|
||||||
* TransactionText or RemoteName tags.
|
* TransactionText or RemoteName tags.
|
||||||
*/
|
*/
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
* ']': increment month
|
* ']': increment month
|
||||||
*
|
*
|
||||||
* '{':
|
* '{':
|
||||||
* '[': decrment month
|
* '[': decrement month
|
||||||
*
|
*
|
||||||
* 'M':
|
* 'M':
|
||||||
* 'm': beginning of month
|
* 'm': beginning of month
|
||||||
|
@ -493,7 +493,7 @@ not found.")))
|
|||||||
(hash-map->list cons *gnc:_report-templates_*)))
|
(hash-map->list cons *gnc:_report-templates_*)))
|
||||||
|
|
||||||
;; This function should be called right before changing a custom-template's name
|
;; This function should be called right before changing a custom-template's name
|
||||||
;; to test if the new name is unique among the existting custom reports.
|
;; to test if the new name is unique among the existing custom reports.
|
||||||
;; If not the calling function can prevent the name from being updated.
|
;; If not the calling function can prevent the name from being updated.
|
||||||
(define (gnc:report-template-has-unique-name? templ-guid new-name)
|
(define (gnc:report-template-has-unique-name? templ-guid new-name)
|
||||||
(or (not new-name)
|
(or (not new-name)
|
||||||
|
@ -981,7 +981,7 @@
|
|||||||
splt-print-amnt))
|
splt-print-amnt))
|
||||||
) ;; end of let*
|
) ;; end of let*
|
||||||
) ;; end of if
|
) ;; end of if
|
||||||
) ;; end of lamda
|
) ;; end of lambda
|
||||||
all-tran-splits) ;; end of map
|
all-tran-splits) ;; end of map
|
||||||
;; if several splits are converted from several currencies, it is
|
;; if several splits are converted from several currencies, it is
|
||||||
;; possible that they won't add - this is a 'plug' amount to make
|
;; possible that they won't add - this is a 'plug' amount to make
|
||||||
|
@ -323,7 +323,7 @@ deprecated_account_security_handler (xmlNodePtr node, gpointer act_pdata)
|
|||||||
PWARN ("Account %s: Obsolete xml tag 'act:security' will not be preserved.",
|
PWARN ("Account %s: Obsolete xml tag 'act:security' will not be preserved.",
|
||||||
xaccAccountGetName (pdata->account));
|
xaccAccountGetName (pdata->account));
|
||||||
/* If the account has both a commodity and a security element, and
|
/* If the account has both a commodity and a security element, and
|
||||||
the commodity is a currecny, then the commodity is probably
|
the commodity is a currency, then the commodity is probably
|
||||||
wrong. In that case we want to replace it with the
|
wrong. In that case we want to replace it with the
|
||||||
security. jralls 2010-11-02 */
|
security. jralls 2010-11-02 */
|
||||||
if (!orig || gnc_commodity_is_currency (orig))
|
if (!orig || gnc_commodity_is_currency (orig))
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/********************************************************************\
|
/********************************************************************\
|
||||||
* gnc-filepath-utils.c -- file path resolutin utilitie *
|
* gnc-filepath-utils.c -- file path resolution utility *
|
||||||
* *
|
* *
|
||||||
* This program is free software; you can redistribute it and/or *
|
* This program is free software; you can redistribute it and/or *
|
||||||
* modify it under the terms of the GNU General Public License as *
|
* modify it under the terms of the GNU General Public License as *
|
||||||
|
@ -71,7 +71,7 @@ returned.
|
|||||||
|
|
||||||
Simple/ad-hoc lazy evaluation works well when data dependencies are
|
Simple/ad-hoc lazy evaluation works well when data dependencies are
|
||||||
simple, but it breaks down when there are too many/circular
|
simple, but it breaks down when there are too many/circular
|
||||||
relationships. It becomes all too easy to get trapped in inifite
|
relationships. It becomes all too easy to get trapped in inifinite
|
||||||
loops of corrections. The goal of moving to a formal constraint
|
loops of corrections. The goal of moving to a formal constraint
|
||||||
system is to introduce specific, well-defined sync points where
|
system is to introduce specific, well-defined sync points where
|
||||||
constraint checking can be done, without incuring circular
|
constraint checking can be done, without incuring circular
|
||||||
|
@ -25,7 +25,7 @@ If it seems to be an independent concept, it can still be placed
|
|||||||
in the KVP tree of the book, which gives it a 'top-level' existence.
|
in the KVP tree of the book, which gives it a 'top-level' existence.
|
||||||
|
|
||||||
If the concept is used only infrequently, then it probably belongs
|
If the concept is used only infrequently, then it probably belongs
|
||||||
in a KVP tree. If the concept has performance-critical requriements,
|
in a KVP tree. If the concept has performance-critical requirements,
|
||||||
then it is better to implement it as a C struct, and similarly
|
then it is better to implement it as a C struct, and similarly
|
||||||
design an appropriate SQL table around it, so that the database
|
design an appropriate SQL table around it, so that the database
|
||||||
can be queried efficiently and rapidly.
|
can be queried efficiently and rapidly.
|
||||||
|
@ -87,7 +87,7 @@ struct _QofBook
|
|||||||
/* Boolean indicates that the session is dirty -- that is, it has
|
/* Boolean indicates that the session is dirty -- that is, it has
|
||||||
* not yet been written out to disk after the last time the
|
* not yet been written out to disk after the last time the
|
||||||
* backend ran commit_edit(). This is distinct from the inherited
|
* backend ran commit_edit(). This is distinct from the inherited
|
||||||
* QofInstance::dirty, which indicates that some persisitent
|
* QofInstance::dirty, which indicates that some persistent
|
||||||
* property of the book object itself has been edited and not
|
* property of the book object itself has been edited and not
|
||||||
* committed. Some backends write data out as part of
|
* committed. Some backends write data out as part of
|
||||||
* commit_edit() and so don't use this flag.
|
* commit_edit() and so don't use this flag.
|
||||||
|
@ -243,7 +243,7 @@ check_equality_operator (void)
|
|||||||
check_unary_op (gnc_numeric_equal,
|
check_unary_op (gnc_numeric_equal,
|
||||||
val, mval, mval, "expected %s = %s");
|
val, mval, mval, "expected %s = %s");
|
||||||
|
|
||||||
/* Certain modulo's should be very cleary un-equal; this
|
/* Certain modulo's should be very clearly un-equal; this
|
||||||
* helps stop funky modulo-64 aliasing in compares that
|
* helps stop funky modulo-64 aliasing in compares that
|
||||||
* might creep in. */
|
* might creep in. */
|
||||||
mval.denom >>= 1;
|
mval.denom >>= 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user