mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Merge 'luzpaz' branch 'source-typos' into maint PR #1364
This commit is contained in:
commit
d688a17ef6
@ -1,14 +1,14 @@
|
||||
#**********************************************************************
|
||||
# Gnu Cash to OpenOffice.org (gnuc2ooo.py)
|
||||
#
|
||||
# Makros for the download of GnuCash Data to OpenOffice.org Base
|
||||
# Macros for the download of GnuCash Data to OpenOffice.org Base
|
||||
#
|
||||
# Makro SetGnuCashFilePaths:
|
||||
# Macro SetGnuCashFilePaths:
|
||||
# Set or change the filepaths of the (GnuCash) data source
|
||||
# and of the new OpenOffice.org database that will be created
|
||||
# in this makro though still empty
|
||||
# in this macro though still empty
|
||||
#
|
||||
# Makro fillGnuCashDB:
|
||||
# Macro fillGnuCashDB:
|
||||
# Download data from the GnuCash data source to OpenOffice.org
|
||||
# Base
|
||||
#
|
||||
@ -35,7 +35,7 @@
|
||||
#
|
||||
#**********************************************************************
|
||||
# Acknowledgements: Special thanks go to the authors on OpenOffice.org
|
||||
# makro programming Roberto Benitez(http://www.baseprogramming.com) and
|
||||
# macro programming Roberto Benitez(http://www.baseprogramming.com) and
|
||||
# Andrew Pitonyak (http://www.pitonyak.org)
|
||||
#**********************************************************************
|
||||
# Changes
|
||||
@ -85,8 +85,8 @@ PathSettings = smgr.createInstanceWithContext(
|
||||
# ************************** PROLOG ***************************************
|
||||
from com.sun.star.ui.dialogs.TemplateDescription import FILEOPEN_SIMPLE, FILESAVE_AUTOEXTENSION
|
||||
lcodec = locale.getdefaultlocale()[1]
|
||||
set_makro = "SetGnuCashFilePaths"
|
||||
settings_textentrance = "#This file was generated by OpenOfficeMakro: "
|
||||
set_macro = "SetGnuCashFilePaths"
|
||||
settings_textentrance = "#This file was generated by OpenOfficeMacro: "
|
||||
settings_textinp = "GnuCashDatafile: "
|
||||
settings_textoutp = "Registered Database in Openoffice.org: "
|
||||
# Trace / Error - Information
|
||||
@ -178,7 +178,7 @@ def exec_SetGnuCashFilePaths():
|
||||
else:
|
||||
return None
|
||||
settings = open(settings_filepath(), 'w')
|
||||
entrance_line = settings_textentrance + set_makro + '\n'
|
||||
entrance_line = settings_textentrance + set_macro + '\n'
|
||||
settings.write(entrance_line)
|
||||
settings.write(settings_textinp)
|
||||
settings.write(GCFile.encode(lcodec) + '\n')
|
||||
@ -194,7 +194,7 @@ def exec_SetGnuCashFilePaths():
|
||||
settings.close()
|
||||
|
||||
MessageBox('A new Openoffice.org database has been created.\n' +
|
||||
'To fill with data please run makro "fillGnuCashDB."',
|
||||
'To fill with data please run macro "fillGnuCashDB."',
|
||||
MsgType="infobox")
|
||||
|
||||
def read_filepaths():
|
||||
@ -630,7 +630,7 @@ def exec_fillGnuCashDB():
|
||||
filepaths = read_filepaths()
|
||||
if not filepaths:
|
||||
MessageBox('Reading filepaths not successful.\n' +
|
||||
'Please run makro ' + '"' + set_makro + '"', MsgType="errorbox")
|
||||
'Please run macro ' + '"' + set_macro + '"', MsgType="errorbox")
|
||||
return False
|
||||
|
||||
gcfile = filepaths[0]
|
||||
|
@ -45,7 +45,7 @@
|
||||
#define GNC_RESPONSE_BACK 2
|
||||
|
||||
/* Callbacks */
|
||||
void gnc_totd_dialog_response_cb (GtkDialog *dialog, gint reponse, gpointer user_data);
|
||||
void gnc_totd_dialog_response_cb (GtkDialog *dialog, gint response, gpointer user_data);
|
||||
void gnc_totd_dialog_startup_toggled_cb (GtkToggleButton *button, gpointer user_data);
|
||||
|
||||
/* The Tips */
|
||||
|
@ -513,7 +513,7 @@ gnc_split_viewer_fill (GNCLotViewer *lv, GtkListStore *store, SplitList *split_l
|
||||
gnc_commodity *currency;
|
||||
Transaction *trans = xaccSplitGetParent (split);
|
||||
time64 date = xaccTransGetDate (trans);
|
||||
gnc_numeric amnt, valu, gains;
|
||||
gnc_numeric amnt, value, gains;
|
||||
|
||||
/* Do not show gains splits, however do show empty business splits */
|
||||
if (!is_business_lot && gnc_numeric_zero_p (xaccSplitGetAmount(split))) continue;
|
||||
@ -541,13 +541,13 @@ gnc_split_viewer_fill (GNCLotViewer *lv, GtkListStore *store, SplitList *split_l
|
||||
* For non-business accounts which are part of a lot,
|
||||
* invert the sign on the first. */
|
||||
currency = xaccTransGetCurrency (trans);
|
||||
valu = xaccSplitGetValue (split);
|
||||
value = xaccSplitGetValue (split);
|
||||
if (lv->selected_lot && !is_business_lot && (node != split_list))
|
||||
valu = gnc_numeric_neg (valu);
|
||||
xaccSPrintAmount (valbuff, valu,
|
||||
value = gnc_numeric_neg (value);
|
||||
xaccSPrintAmount (valbuff, value,
|
||||
gnc_commodity_print_info (currency, TRUE));
|
||||
gtk_list_store_set (store, &iter, SPLIT_COL_VALUE, valbuff, -1);
|
||||
gtk_list_store_set (store, &iter, SPLIT_COL_VALUE_DOUBLE, gnc_numeric_to_double (valu), -1);
|
||||
gtk_list_store_set (store, &iter, SPLIT_COL_VALUE_DOUBLE, gnc_numeric_to_double (value), -1);
|
||||
|
||||
/* Gains. Blank if none. */
|
||||
gains = xaccSplitGetCapGains (split);
|
||||
|
@ -59,7 +59,7 @@ extern "C"
|
||||
#define GNC_LIB_REL_PATH "xml"
|
||||
|
||||
static void
|
||||
remove_files_pattern (const char* begining, const char* ending)
|
||||
remove_files_pattern (const char* beginning, const char* ending)
|
||||
{
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user