IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use billing_id consistently (fixed billing_id/billingid/biing_id mixup)

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21247 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens 2011-09-11 14:23:55 +00:00
parent 8f6e8391eb
commit e80d9aed13
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/bi_import/bi_import.c
View File

@ -172,7 +172,7 @@ gnc_bi_import_read_file (const gchar * filename, const gchar * parser_regexp,
FILL_IN_HELPER ("id", ID); /* FIXME: Should "id" be translated? I don't think so. */ FILL_IN_HELPER ("id", ID); /* FIXME: Should "id" be translated? I don't think so. */
FILL_IN_HELPER ("date_opened", DATE_OPENED); FILL_IN_HELPER ("date_opened", DATE_OPENED);
FILL_IN_HELPER ("owner_id", OWNER_ID); FILL_IN_HELPER ("owner_id", OWNER_ID);
FILL_IN_HELPER ("biing_id", BILLING_ID); FILL_IN_HELPER ("billing_id", BILLING_ID);
FILL_IN_HELPER ("notes", NOTES); FILL_IN_HELPER ("notes", NOTES);
FILL_IN_HELPER ("date", DATE); FILL_IN_HELPER ("date", DATE);
@ -476,7 +476,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
{ {
gboolean valid; gboolean valid;
GtkTreeIter iter; GtkTreeIter iter;
gchar *id, *date_opened, *owner_id, *biing_id, *notes; gchar *id, *date_opened, *owner_id, *billing_id, *notes;
gchar *date, *desc, *action, *account, *quantity, *price, *disc_type, gchar *date, *desc, *action, *account, *quantity, *price, *disc_type,
*disc_how, *discount, *taxable, *taxincluded, *tax_table; *disc_how, *discount, *taxable, *taxincluded, *tax_table;
gchar *date_posted, *due_date, *account_posted, *memo_posted, gchar *date_posted, *due_date, *account_posted, *memo_posted,
@ -520,7 +520,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
MEMO_POSTED, &memo_posted, // if autoposting requested MEMO_POSTED, &memo_posted, // if autoposting requested
ACCU_SPLITS, &accumulatesplits, // if autoposting requested ACCU_SPLITS, &accumulatesplits, // if autoposting requested
OWNER_ID, &owner_id, OWNER_ID, &owner_id,
BILLING_ID, &biing_id, BILLING_ID, &billing_id,
NOTES, &notes, NOTES, &notes,
DATE, &date, DATE, &date,
DESC, &desc, DESC, &desc,
@ -574,7 +574,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
timespecFromTime_t (&now_timespec, now); timespecFromTime_t (&now_timespec, now);
gncInvoiceSetDateOpened (invoice, now_timespec); gncInvoiceSetDateOpened (invoice, now_timespec);
} }
gncInvoiceSetBillingID (invoice, biing_id); gncInvoiceSetBillingID (invoice, billing_id);
gncInvoiceSetNotes (invoice, notes); gncInvoiceSetNotes (invoice, notes);
gncInvoiceSetActive (invoice, TRUE); gncInvoiceSetActive (invoice, TRUE);
//if (g_ascii_strcasecmp(type,"INVOICE"))gncInvoiceSetBillTo( invoice, billto ); //if (g_ascii_strcasecmp(type,"INVOICE"))gncInvoiceSetBillTo( invoice, billto );
@ -612,7 +612,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
g_free (id); g_free (id);
g_free (date_opened); g_free (date_opened);
g_free (owner_id); g_free (owner_id);
g_free (biing_id); g_free (billing_id);
g_free (notes); g_free (notes);
g_free (date); g_free (date);
g_free (desc); g_free (desc);
@ -716,7 +716,7 @@ gnc_bi_import_create_bis (GtkListStore * store, QofBook * book,
g_free (id); g_free (id);
g_free (date_opened); g_free (date_opened);
g_free (owner_id); g_free (owner_id);
g_free (biing_id); g_free (billing_id);
g_free (notes); g_free (notes);
g_free (date); g_free (date);
g_free (desc); g_free (desc);

12
src/plugins/bi_import/gui.c
View File

@ -112,7 +112,7 @@ gnc_plugin_bi_import_showGUI(void)
gui->book = gnc_get_current_book(); gui->book = gnc_get_current_book();
gui->regexp = g_string_new ( "^(?<id>[^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billingid>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*)(;?(?<disc_type>[^;]*)(;?(?<disc_how>[^;]*)(;?(?<discount>[^;]*)(;?(?<taxable>[^;]*)(;?(?<taxincluded>[^;]*)(;?(?<tax_table>[^;]*)(;(?<date_posted>[^;]*)(;(?<due_date>[^;]*)(;(?<account_posted>[^;]*)(;(?<memo_posted>[^;]*)(;(?<accu_splits>[^;]*))?)?)?)?)?)?)?)?)?)?)?"); gui->regexp = g_string_new ( "^(?<id>[^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billing_id>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*)(;?(?<disc_type>[^;]*)(;?(?<disc_how>[^;]*)(;?(?<discount>[^;]*)(;?(?<taxable>[^;]*)(;?(?<taxincluded>[^;]*)(;?(?<tax_table>[^;]*)(;(?<date_posted>[^;]*)(;(?<due_date>[^;]*)(;(?<account_posted>[^;]*)(;(?<memo_posted>[^;]*)(;(?<accu_splits>[^;]*))?)?)?)?)?)?)?)?)?)?)?");
// create model and bind to view // create model and bind to view
gui->store = gtk_list_store_new (N_COLUMNS, gui->store = gtk_list_store_new (N_COLUMNS,
@ -128,7 +128,7 @@ gnc_plugin_bi_import_showGUI(void)
CREATE_COLUMN ("id", ID); CREATE_COLUMN ("id", ID);
CREATE_COLUMN ("date__opened", DATE_OPENED); CREATE_COLUMN ("date__opened", DATE_OPENED);
CREATE_COLUMN ("owner__id", OWNER_ID); CREATE_COLUMN ("owner__id", OWNER_ID);
CREATE_COLUMN ("billing_id", BILLING_ID); CREATE_COLUMN ("billing__id", BILLING_ID);
CREATE_COLUMN ("notes", NOTES); CREATE_COLUMN ("notes", NOTES);
CREATE_COLUMN ("date", DATE); CREATE_COLUMN ("date", DATE);
@ -293,7 +293,7 @@ void gnc_bi_import_gui_option1_cb (GtkWidget *widget, gpointer data)
BillImportGui *gui = data; BillImportGui *gui = data;
if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) )) if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
return; return;
g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billingid>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)"); g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billing_id>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)");
gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui); gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
} }
void gnc_bi_import_gui_option2_cb (GtkWidget *widget, gpointer data) void gnc_bi_import_gui_option2_cb (GtkWidget *widget, gpointer data)
@ -301,7 +301,7 @@ void gnc_bi_import_gui_option2_cb (GtkWidget *widget, gpointer data)
BillImportGui *gui = data; BillImportGui *gui = data;
if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) )) if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
return; return;
g_string_assign (gui->regexp, "^(?<id>[^!#+^,]*),(?<date_opened>[^,]*),(?<owner_id>[^,]*),(?<billingid>[^,]*),?(?<notes>[^,]*),?(?<date>[^,]*),?(?<desc>[^,]*),?(?<action>[^,]*),?(?<account>[^,]*),?(?<quantity>[^,]*),?(?<price>[^,]*),?(?<disc_type>[^,]*),?(?<disc_how>[^,]*),?(?<discount>[^,]*),?(?<taxable>[^,]*),?(?<taxincluded>[^,]*),?(?<tax_table>[^,]*),(?<date_posted>[^,]*),(?<due_date>[^,]*),(?<account_posted>[^,]*),(?<memo_posted>[^,]*),(?<accu_splits>[^,]*)"); g_string_assign (gui->regexp, "^(?<id>[^!#+^,]*),(?<date_opened>[^,]*),(?<owner_id>[^,]*),(?<billing_id>[^,]*),?(?<notes>[^,]*),?(?<date>[^,]*),?(?<desc>[^,]*),?(?<action>[^,]*),?(?<account>[^,]*),?(?<quantity>[^,]*),?(?<price>[^,]*),?(?<disc_type>[^,]*),?(?<disc_how>[^,]*),?(?<discount>[^,]*),?(?<taxable>[^,]*),?(?<taxincluded>[^,]*),?(?<tax_table>[^,]*),(?<date_posted>[^,]*),(?<due_date>[^,]*),(?<account_posted>[^,]*),(?<memo_posted>[^,]*),(?<accu_splits>[^,]*)");
gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui); gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
} }
void gnc_bi_import_gui_option3_cb (GtkWidget *widget, gpointer data) void gnc_bi_import_gui_option3_cb (GtkWidget *widget, gpointer data)
@ -309,7 +309,7 @@ void gnc_bi_import_gui_option3_cb (GtkWidget *widget, gpointer data)
BillImportGui *gui = data; BillImportGui *gui = data;
if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) )) if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
return; return;
g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billingid>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)"); g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billing_id>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)");
gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui); gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
} }
void gnc_bi_import_gui_option4_cb (GtkWidget *widget, gpointer data) void gnc_bi_import_gui_option4_cb (GtkWidget *widget, gpointer data)
@ -317,7 +317,7 @@ void gnc_bi_import_gui_option4_cb (GtkWidget *widget, gpointer data)
BillImportGui *gui = data; BillImportGui *gui = data;
if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) )) if (!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ))
return; return;
g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billingid>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)"); g_string_assign (gui->regexp, "^(?<id>[^!#+^;]*);(?<date_opened>[^;]*);(?<owner_id>[^;]*);(?<billing_id>[^;]*);?(?<notes>[^;]*);?(?<date>[^;]*);?(?<desc>[^;]*);?(?<action>[^;]*);?(?<account>[^;]*);?(?<quantity>[^;]*);?(?<price>[^;]*);?(?<disc_type>[^;]*);?(?<disc_how>[^;]*);?(?<discount>[^;]*);?(?<taxable>[^;]*);?(?<taxincluded>[^;]*);?(?<tax_table>[^;]*);(?<date_posted>[^;]*);(?<due_date>[^;]*);(?<account_posted>[^;]*);(?<memo_posted>[^;]*);(?<accu_splits>[^;]*)");
gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui); gnc_bi_import_gui_filenameChanged_cb (gui->entryFilename, gui);
} }
void gnc_bi_import_gui_option5_cb (GtkWidget *widget, gpointer data) void gnc_bi_import_gui_option5_cb (GtkWidget *widget, gpointer data)