namespace administration

1 files changed, 16 insertions, 16 deletions

diff --git a/src/administration_reader.cpp b/src/administration_reader.cpp
index 49a148f..7400caf 100644
--- a/src/administration_reader.cpp
+++ b/src/administration_reader.cpp
@@ -36,7 +36,7 @@ bool administration_reader::open_new()
 
     if (!save_path) return false;
 
-    administration_create_default(save_path);
+    administration::create_default(save_path);
 
     return true;
 }
@@ -49,7 +49,7 @@ bool administration_reader::save_new()
 
     if (!save_path) return false;
 
-    administration_set_file_path(save_path);
+    administration::set_file_path(save_path);
     administration_writer::save_all_async();
 
     return true;
@@ -67,7 +67,7 @@ bool administration_reader::open_existing(char* file_path)
 
     STOPWATCH_START;
 
-    administration_create_from_file(file_path);
+    administration::create_from_file(file_path);
 
     zip_t* zip = zip_open(file_path, 0, 'r');
 
@@ -131,7 +131,7 @@ bool administration_reader::read_invoice_from_xml(invoice* result, char* buffer,
     struct xml_node* root = xml_document_root(document);
     if (!root) return false;
 
-    invoice data = administration_invoice_create_empty();
+    invoice data = administration::invoice_create_empty();
     xml_get_str(root, data.id, MAX_LEN_ID, "cbc:ID");
     xml_get_str_x(root, data.sequential_number, MAX_LEN_ID, "cac:OrderReference", "cbc:ID", 0);
     xml_get_str(root, data.currency, MAX_LEN_CURRENCY, "cbc:DocumentCurrencyCode");
@@ -234,8 +234,8 @@ bool administration_reader::read_invoice_from_xml(invoice* result, char* buffer,
 
             // Import service could set tax rate id to shorthandle.
             tax_rate tax_rate;
-            if (administration_tax_rate_get_by_id(&tax_rate, bi.tax_rate_id) == A_ERR_NOT_FOUND) {
-                if (administration_tax_rate_get_by_shorthandle(&tax_rate, bi.tax_rate_id) == A_ERR_SUCCESS) {
+            if (administration::tax_rate_get_by_id(&tax_rate, bi.tax_rate_id) == A_ERR_NOT_FOUND) {
+                if (administration::tax_rate_get_by_shorthandle(&tax_rate, bi.tax_rate_id) == A_ERR_SUCCESS) {
                     strops::copy(bi.tax_rate_id, tax_rate.id, MAX_LEN_ID);
                 }
                 else {
@@ -243,7 +243,7 @@ bool administration_reader::read_invoice_from_xml(invoice* result, char* buffer,
                 }
             }
 
-            administration_billing_item_import_to_invoice(&data, bi);
+            administration::billing_item_import_to_invoice(&data, bi);
         }
 
         free(child_name);
@@ -259,7 +259,7 @@ bool administration_reader::import_invoice(char* buffer, size_t buffer_size)
 
     invoice data;
     if (!administration_reader::read_invoice_from_xml(&data, buffer, buffer_size)) return false;
-    a_err result = administration_invoice_import(&data);
+    a_err result = administration::invoice_import(&data);
     
     if (result == A_ERR_SUCCESS) {
         logger::info("Loaded invoice '%s' in %.3fms.", data.sequential_number, STOPWATCH_TIME);
@@ -299,7 +299,7 @@ bool administration_reader::import_contact(char* buffer, size_t buffer_size)
     xml_get_str(node_address, data.address.postal, MAX_LEN_ADDRESS, "Postal");
     xml_get_str(node_address, data.address.region, MAX_LEN_ADDRESS, "Region");
 
-    a_err result = administration_contact_import(data);  
+    a_err result = administration::contact_import(data);  
     if (result == A_ERR_SUCCESS) {
         logger::info("Loaded contact '%s' in %.3fms.", data.name, STOPWATCH_TIME);
     }
@@ -327,7 +327,7 @@ bool administration_reader::import_project(char* buffer, size_t buffer_size)
     data.start_date = xml_get_date_x(root, "StartDate", 0);
     data.end_date = xml_get_date_x(root, "EndDate", 0);
 
-    a_err result = administration_project_import(data);  
+    a_err result = administration::project_import(data);  
     if (result == A_ERR_SUCCESS) {
         logger::info("Loaded project in %.3fms. id=%s description=%s state=%d started=%lld end=%lld", 
             STOPWATCH_TIME, data.id, data.description, data.state, data.start_date, data.end_date);
@@ -354,7 +354,7 @@ bool administration_reader::import_cost_center(char* buffer, size_t buffer_size)
     xml_get_str(root, data.code, MAX_LEN_CODE, "Code");
     xml_get_str(root, data.description, MAX_LEN_LONG_DESC, "Description");
 
-    a_err result = administration_cost_center_import(data);
+    a_err result = administration::cost_center_import(data);
     if (result == A_ERR_SUCCESS) {
         logger::info("Loaded cost center in %.3fms. id=%s code=%s description=%s", 
             STOPWATCH_TIME, data.id, data.code, data.description);
@@ -382,7 +382,7 @@ bool administration_reader::import_tax_rate(char* buffer, size_t buffer_size)
     xml_get_str(root, data.category_code, MAX_LEN_CODE, "Category");
     data.rate = xml_get_float(root, "Rate");
 
-    a_err result = administration_tax_rate_import(data);
+    a_err result = administration::tax_rate_import(data);
     if (result == A_ERR_SUCCESS) {
         logger::info("Loaded tax rate info in %.3fms. id=%s country_code=%s category_code=%s rate=%.2f", 
             STOPWATCH_TIME, data.id, data.country_code, data.category_code, data.rate);
@@ -404,16 +404,16 @@ bool administration_reader::import_administration_info(char* buffer, size_t buff
 
     struct xml_node* root = xml_document_root(document);
 
-    administration_set_next_id(xml_get_s32(root, "NextId"));
-    administration_set_next_sequence_number(xml_get_s32(root, "NextSequenceNumber"));
+    administration::set_next_id(xml_get_s32(root, "NextId"));
+    administration::set_next_sequence_number(xml_get_s32(root, "NextSequenceNumber"));
 
     ai_service ai_service;
     ai_service.provider = (ai_provider)xml_get_s32_x(root, "AIService", "Provider", 0);
     xml_get_str_x(root, ai_service.api_key_public, MAX_LEN_API_KEY, "AIService", "PublicKey", 0);
-    administration_set_ai_service(ai_service);
+    administration::set_ai_service(ai_service);
 
     logger::info("Loaded administration info in %.3fms. next_id=%d next_sequence_number=%d", 
-        STOPWATCH_TIME, administration_get_next_id(), administration_get_next_sequence_number());
+        STOPWATCH_TIME, administration::get_next_id(), administration::get_next_sequence_number());
 
     return true;
 }
\ No newline at end of file