diff options
Diffstat (limited to 'src/administration.cpp')
| -rw-r--r-- | src/administration.cpp | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/administration.cpp b/src/administration.cpp index 9fdfe7e..cb158e2 100644 --- a/src/administration.cpp +++ b/src/administration.cpp @@ -26,7 +26,7 @@ static ledger g_administration; -static data_changed_event data_changed_event_callback = 0; +static data_changed_event administration_data_changed_event_callback = 0; static data_deleted_event data_deleted_event_callback = 0; static invoice_changed_event invoice_changed_event_callback = 0; static contact_changed_event contact_changed_event_callback = 0; @@ -58,7 +58,6 @@ static void create_default_cost_centers() list_append(&g_administration.cost_centers, tb);\ g_administration.next_id++;\ if (costcenter_changed_event_callback) costcenter_changed_event_callback(tb);\ - if (data_changed_event_callback) data_changed_event_callback();\ } ADD_COSTCENTER("costcenter.general_expenses", "GENE"); @@ -81,9 +80,9 @@ static s32 create_sequence_number() // Callback functions. // ======================= -void administration::set_data_changed_event_callback(data_changed_event ev) +void administration::set_administration_data_changed_event_callback(data_changed_event ev) { - data_changed_event_callback = ev; + administration_data_changed_event_callback = ev; } void administration::set_data_deleted_event_callback(data_deleted_event ev) @@ -227,7 +226,7 @@ ai_service administration::get_ai_service() void administration::set_ai_service(ai_service provider) { g_administration.ai_service = provider; - if (data_changed_event_callback) data_changed_event_callback(); + if (administration_data_changed_event_callback) administration_data_changed_event_callback(); } void administration::set_next_id(s32 nr) @@ -650,7 +649,6 @@ void administration::company_info_set(contact data) strops::copy(g_administration.default_currency, get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY); if (contact_changed_event_callback) contact_changed_event_callback(&data); - if (data_changed_event_callback) data_changed_event_callback(); } // Contact functions. @@ -690,7 +688,6 @@ a_err administration::contact_add(contact data) g_administration.next_id++; if (contact_changed_event_callback) contact_changed_event_callback(new_contact); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -708,7 +705,6 @@ a_err administration::contact_update(contact data) memops::copy(c, &data, sizeof(data)); if (contact_changed_event_callback) contact_changed_event_callback(c); - if (data_changed_event_callback) data_changed_event_callback(); list_iterator_stop(&g_administration.contacts); return A_ERR_SUCCESS; @@ -1001,7 +997,6 @@ a_err administration::project_add(project data) g_administration.next_id++; if (project_changed_event_callback) project_changed_event_callback(new_project); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1020,7 +1015,6 @@ a_err administration::project_update(project data) list_iterator_stop(&g_administration.projects); if (project_changed_event_callback) project_changed_event_callback(c); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1163,7 +1157,6 @@ a_err administration::tax_rate_enable(tax_rate data) g_administration.next_id++; if (taxrate_changed_event_callback) taxrate_changed_event_callback(&data); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1291,7 +1284,6 @@ a_err administration::cost_center_add(cost_center data) g_administration.next_id++; if (costcenter_changed_event_callback) costcenter_changed_event_callback(tb); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1310,7 +1302,6 @@ a_err administration::cost_center_update(cost_center data) list_iterator_stop(&g_administration.cost_centers); if (costcenter_changed_event_callback) costcenter_changed_event_callback(c); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1502,7 +1493,6 @@ a_err administration::invoice_update(invoice* inv) list_iterator_stop(&g_administration.invoices); if (invoice_changed_event_callback) invoice_changed_event_callback(c); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1568,7 +1558,6 @@ a_err administration::invoice_add(invoice* inv) else g_administration.expense_count++; if (invoice_changed_event_callback) invoice_changed_event_callback(new_inv); - if (data_changed_event_callback) data_changed_event_callback(); return A_ERR_SUCCESS; } @@ -1784,10 +1773,6 @@ static void administration_recalculate_billing_item_totals(billing_item* item) { item->tax = item->net * (rate.rate/100.0f); } - else - { - assert(0); - } item->total = item->net + item->tax; } |