diff options
Diffstat (limited to 'src/administration_writer.cpp')
| -rw-r--r-- | src/administration_writer.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/administration_writer.cpp b/src/administration_writer.cpp index ee22022..ebc0056 100644 --- a/src/administration_writer.cpp +++ b/src/administration_writer.cpp @@ -428,8 +428,7 @@ bool administration_writer::save_invoice_blocking(invoice inv) strops::replace_float(tax_entry_file_content, tax_entry_buf_length, "{{TAX_AMOUNT}}", subtotal.tax, 2); char tax_category[10]; - strops::copy(tax_category, tax_rate_buffer[i].category_code, sizeof(tax_category)); - strops::tokenize(tax_category, "#"); + tax_category[0] = 0; // TODO get tax category strops::replace(tax_entry_file_content, tax_entry_buf_length, "{{TAX_CATEGORY}}", tax_category); strops::replace_float(tax_entry_file_content, tax_entry_buf_length, "{{TAX_PERCENT}}", tax_rate_buffer[i].rate, 2); @@ -470,13 +469,13 @@ bool administration_writer::save_invoice_blocking(invoice inv) billing_item bi = billing_item_buffer[i]; tax_rate rate; - administration::tax_rate_get_by_id(&rate, bi.tax_rate_id); + administration::tax_rate_get_by_internal_code(&rate, bi.tax_internal_code); strops::replace(billing_item_file_content, billing_item_buf_length, "{{CURRENCY}}", bi.currency); strops::replace(billing_item_file_content, billing_item_buf_length, "{{LINE_ID}}", bi.id); - strops::replace(billing_item_file_content, billing_item_buf_length, "{{LINE_TAX_ID}}", bi.tax_rate_id); + strops::replace(billing_item_file_content, billing_item_buf_length, "{{LINE_TAX_ID}}", bi.tax_internal_code); strops::replace(billing_item_file_content, billing_item_buf_length, "{{ITEM_NAME}}", bi.description); - strops::replace(billing_item_file_content, billing_item_buf_length, "{{LINE_TAX_CATEGORY}}", rate.category_code); + strops::replace(billing_item_file_content, billing_item_buf_length, "{{LINE_TAX_CATEGORY}}", "S"); // TODO get from tax code strops::replace_float(billing_item_file_content, billing_item_buf_length, "{{LINE_TAX_PERCENT}}", rate.rate, 2); strops::replace_float(billing_item_file_content, billing_item_buf_length, "{{LINE_AMOUNT}}", bi.net, 2); // line amount = net_per_item * items_count - discount strops::replace_float(billing_item_file_content, billing_item_buf_length, "{{QUANTITY}}", bi.amount, 2); @@ -699,6 +698,7 @@ bool administration_writer::save_tax_rate_blocking(tax_rate rate) bool administration_writer::save_all_tax_rates_blocking() { + /* //// Get all data. u32 num_rates = administration::tax_rate_count(); u32 buffer_size = sizeof(tax_rate) * num_rates; @@ -714,6 +714,8 @@ bool administration_writer::save_all_tax_rates_blocking() memops::unalloc(rate_buffer); return result; + */ + return 1; } ///////////////////////////// |