[grisbi-cvs] grisbi/src export_csv.c, 1.26, 1.27 import.c, 1.312, 1.313 import_csv.c, 1.61, 1.62 tip.c, 1.32, 1.33
Pierre Biava
pbiava at users.sourceforge.net
Fri Jan 1 14:21:33 CET 2010
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.75, 1.76 da.po, 1.82, 1.83 de.po, 1.148, 1.149 el.po, 1.46, 1.47 eo.po, 1.39, 1.40 es.po, 1.142, 1.143 fa.po, 1.69, 1.70 fr.po, 1.211, 1.212 grisbi.pot, 1.117, 1.118 he.po, 1.75, 1.76 it.po, 1.75, 1.76 nl.po, 1.74, 1.75 pl.po, 1.80, 1.81 pt_BR.po, 1.77, 1.78 ro.po, 1.76, 1.77 ru.po, 1.74, 1.75 zh_CN.po, 1.70, 1.71
- Next message: [grisbi-cvs] grisbi/pixmaps ac_bank_ce.png, NONE, 1.1 ac_bank_lcl.png, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19793/src
Modified Files:
export_csv.c import.c import_csv.c tip.c
Log Message:
fixes a bug in the export of an split operation and minor changes
Index: import.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import.c,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- import.c 19 Dec 2009 04:31:57 -0000 1.312
+++ import.c 1 Jan 2010 13:21:31 -0000 1.313
@@ -322,14 +322,22 @@
g_free (formats);
g_free (tmpstr);
- gsb_assistant_add_page ( assistant, import_create_file_selection_page ( assistant ),
- IMPORT_FILESEL_PAGE, IMPORT_STARTUP_PAGE, IMPORT_RESUME_PAGE,
+ gsb_assistant_add_page ( assistant,
+ import_create_file_selection_page ( assistant ),
+ IMPORT_FILESEL_PAGE,
+ IMPORT_STARTUP_PAGE,
+ IMPORT_RESUME_PAGE,
G_CALLBACK ( import_enter_file_selection_page ) );
- gsb_assistant_add_page ( assistant, import_create_csv_preview_page ( assistant ),
- IMPORT_CSV_PAGE, IMPORT_FILESEL_PAGE, IMPORT_RESUME_PAGE,
+ gsb_assistant_add_page ( assistant,
+ import_create_csv_preview_page ( assistant ),
+ IMPORT_CSV_PAGE,
+ IMPORT_FILESEL_PAGE,
+ IMPORT_RESUME_PAGE,
G_CALLBACK ( import_enter_csv_preview_page ) );
- gsb_assistant_add_page ( assistant, import_create_resume_page ( assistant ),
- IMPORT_RESUME_PAGE, IMPORT_FILESEL_PAGE,
+ gsb_assistant_add_page ( assistant,
+ import_create_resume_page ( assistant ),
+ IMPORT_RESUME_PAGE,
+ IMPORT_FILESEL_PAGE,
IMPORT_FIRST_ACCOUNT_PAGE,
G_CALLBACK ( import_enter_resume_page ) );
@@ -455,10 +463,10 @@
gboolean import_switch_type ( GtkCellRendererText *cell, const gchar *path,
const gchar *value, GtkListStore * model )
{
- GtkTreeIter iter;
- GtkWidget * assistant;
+ GtkTreeIter iter;
+ GtkWidget * assistant;
- assistant = g_object_get_data ( G_OBJECT (model), "assistant" );
+ assistant = g_object_get_data ( G_OBJECT (model), "assistant" );
if ( gtk_tree_model_get_iter_from_string ( GTK_TREE_MODEL ( model ), &iter, path ))
{
Index: import_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/import_csv.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- import_csv.c 29 Dec 2009 21:32:09 -0000 1.61
+++ import_csv.c 1 Jan 2010 13:21:31 -0000 1.62
@@ -83,11 +83,11 @@
{ N_("Notes"), 0.0, csv_import_validate_string, csv_import_parse_notes, "" },
{ N_("Voucher number"), 0.0, csv_import_validate_number, csv_import_parse_voucher, "" },
{ N_("Category"), 0.0, csv_import_validate_string, csv_import_parse_category, "" },
- { N_("Sub-Category"), 0.0, csv_import_validate_string, csv_import_parse_sub_category, "" },
- { N_("Budget"), 0.0, csv_import_validate_string, csv_import_parse_budget, "" },
- { N_("Sub-budget"), 0.0, csv_import_validate_string, csv_import_parse_sub_budget, "" },
- { N_("Balance"), 0.0, csv_import_validate_amount, csv_import_parse_balance, "" },
- { N_("Credit (amount)"),0.0, csv_import_validate_amount, csv_import_parse_credit, "" },
+ { N_("Sub-categories"), 0.0, csv_import_validate_string, csv_import_parse_sub_category, "" },
+ { N_("Budgetary lines"), 0.0, csv_import_validate_string, csv_import_parse_budget, "" },
+ { N_("Sub-budgetary lines"), 0.0, csv_import_validate_string, csv_import_parse_sub_budget, "" },
+ { N_("Balance"), 0.0, csv_import_validate_amount, csv_import_parse_balance, "" },
+ { N_("Credit (amount)"), 0.0, csv_import_validate_amount, csv_import_parse_credit, "" },
{ N_("Debit (absolute)"),0.0, csv_import_validate_amount, csv_import_parse_debit, N_("Debit") },
{ N_("Debit (negative)"),0.0, csv_import_validate_amount, csv_import_parse_credit, "" },
{ N_("C/R"), 0.0, csv_import_validate_string, csv_import_parse_p_r, "" },
Index: export_csv.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/export_csv.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- export_csv.c 1 Jan 2010 09:57:27 -0000 1.26
+++ export_csv.c 1 Jan 2010 13:21:31 -0000 1.27
@@ -1,10 +1,11 @@
/* ************************************************************************** */
/* This file manage cvs export format */
/* */
-/* Copyright (C) 2004 François Terrot (francois.terrot at grisbi.org) */
-/* 2005 Alain Portal (aportal at univ-montp2.fr) */
-/* 2009 Benjamin Drieu (bdrieu at april.org) */
-/* http://www.grisbi.org */
+/* Copyright (C) 2004 François Terrot (francois.terrot at grisbi.org) */
+/* 2005 Alain Portal (aportal at univ-montp2.fr) */
+/* 2009 Benjamin Drieu (bdrieu at april.org) */
+/* 2010 Pierre Biava (grisbi at pierre.biava.name) */
+/* http://www.grisbi.org */
/* */
/* This program is free software; you can redistribute it and/or modify */
/* it under the terms of the GNU General Public License as published by */
@@ -421,17 +422,19 @@
gint return_exponent;
gint account_number;
gchar* tmpstr;
+ const GDate *value_date, *date;
+ gint payment_method;
account_number = gsb_data_transaction_get_account_number (transaction_number);
- return_exponent = gsb_data_currency_get_floating_point (gsb_data_account_get_currency (account_number));
/* Si c'est une ventilation d'opération (cà d une opération fille),
- elle n'est pas traitée à la base du "if" mais plus loin, quand
- son opé ventilée sera exportée */
- if ( ! gsb_data_transaction_get_mother_transaction_number (transaction_number) )
- {
- const GDate * value_date, * date;
- gint payment_method;
+ elle n'est pas traitée à la base du "if" mais plus loin, quand
+ son opé ventilée sera exportée */
+ if ( gsb_data_transaction_get_mother_transaction_number (transaction_number) )
+ return TRUE;
+
+ return_exponent = gsb_data_currency_get_floating_point (
+ gsb_data_account_get_currency (account_number));
/* met la date */
date = gsb_data_transaction_get_date ( transaction_number );
@@ -506,7 +509,7 @@
else
csv_field_debit = gsb_real_get_string (gsb_real_abs (amount));
- /* met le cheque si c'est un type a?numerotation automatique */
+ /* met le cheque si c'est un type à numerotation automatique */
payment_method = gsb_data_transaction_get_method_of_payment_number ( transaction_number );
CSV_CLEAR_FIELD (csv_field_cheque);
if (gsb_data_payment_get_automatic_numbering (payment_method))
@@ -566,6 +569,7 @@
CSV_CLEAR_FIELD (csv_field_categ);
csv_field_categ = my_strdup (_("Split of transaction"));
+
csv_add_record(csv_file,FALSE, print_balance);
pSplitTransactionList = gsb_data_transaction_get_transactions_list ();
@@ -574,11 +578,14 @@
{
gint pSplitTransaction;
- pSplitTransaction = GPOINTER_TO_INT(pSplitTransactionList -> data);
+ pSplitTransaction = gsb_data_transaction_get_transaction_number (
+ pSplitTransactionList -> data );
- if ( gsb_data_transaction_get_account_number ( pSplitTransaction ) == gsb_data_transaction_get_account_number (transaction_number)
- &&
- gsb_data_transaction_get_mother_transaction_number ( pSplitTransaction ) == transaction_number )
+ if ( gsb_data_transaction_get_account_number (
+ pSplitTransaction ) == gsb_data_transaction_get_account_number (transaction_number)
+ &&
+ gsb_data_transaction_get_mother_transaction_number (
+ pSplitTransaction ) == transaction_number )
{
/* on commence par mettre la catég et sous categ de l'opé et de l'opé de ventilation */
CSV_CLEAR_FIELD (csv_field_ventil);
@@ -725,7 +732,6 @@
}
csv_add_record(csv_file,TRUE, print_balance);
}
- }
return TRUE;
}
Index: tip.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/tip.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- tip.c 30 Dec 2009 20:26:03 -0000 1.32
+++ tip.c 1 Jan 2010 13:21:31 -0000 1.33
@@ -111,7 +111,7 @@
tmpstr = g_strconcat ( make_pango_attribut (
"size=\"larger\" weight=\"bold\"", _("Did you know that...") ),
"\n\n",
- g_markup_printf_escaped ( dgettext ("grisbi-tips", get_next_tip () ) ),
+ dgettext ("grisbi-tips", get_next_tip ( ) ),
NULL );
gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
@@ -124,7 +124,7 @@
tmpstr = g_strconcat ( make_pango_attribut (
"size=\"larger\" weight=\"bold\"", _("Did you know that...") ),
"\n\n",
- g_markup_printf_escaped ( dgettext ("grisbi-tips", get_next_tip () ) ),
+ dgettext ("grisbi-tips", get_next_tip ( ) ),
NULL );
gtk_label_set_markup ( GTK_LABEL ( GTK_MESSAGE_DIALOG(dialog) -> label ),
@@ -141,7 +141,6 @@
}
-
/**
* Returns the string representation of next tip to be displayed,
* according to last tip displayed.
- Previous message: [grisbi-cvs] grisbi/po cs.po, 1.75, 1.76 da.po, 1.82, 1.83 de.po, 1.148, 1.149 el.po, 1.46, 1.47 eo.po, 1.39, 1.40 es.po, 1.142, 1.143 fa.po, 1.69, 1.70 fr.po, 1.211, 1.212 grisbi.pot, 1.117, 1.118 he.po, 1.75, 1.76 it.po, 1.75, 1.76 nl.po, 1.74, 1.75 pl.po, 1.80, 1.81 pt_BR.po, 1.77, 1.78 ro.po, 1.76, 1.77 ru.po, 1.74, 1.75 zh_CN.po, 1.70, 1.71
- Next message: [grisbi-cvs] grisbi/pixmaps ac_bank_ce.png, NONE, 1.1 ac_bank_lcl.png, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list