diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/administration.hpp | 15 | ||||
| -rw-r--r-- | include/ui.hpp | 2 |
2 files changed, 4 insertions, 13 deletions
diff --git a/include/administration.hpp b/include/administration.hpp index c8013b9..40e58fe 100644 --- a/include/administration.hpp +++ b/include/administration.hpp @@ -57,17 +57,11 @@ typedef enum #define MAX_TAX_SECTION_PER_RATE 3 typedef struct { - char id[MAX_LEN_ID]; // T/[id] TODO: can we get rid of this? char internal_code[MAX_LEN_SHORT_DESC]; float rate; // 0-100% u32 tax_section_count; char tax_sections[MAX_TAX_SECTION_PER_RATE][MAX_LEN_SHORT_DESC]; // Country specific tax section tax_rate_type type; - - // depricated: - char tax_section[MAX_LEN_SHORT_DESC]; - char category_code[MAX_LEN_CODE]; // Category code. https://docs.peppol.eu/poacc/billing/3.0/codelist/UNCL5305/ - char country_code[MAX_LEN_COUNTRY_CODE]; // 2 letter country code } tax_rate; typedef struct @@ -160,7 +154,7 @@ typedef struct float allowance; // Total discount. float net; // Total net, with discount. char currency[MAX_LEN_CURRENCY]; // 3 letter code, always matches invoice currency. - char tax_rate_id[MAX_LEN_ID]; // T/[id] + char tax_internal_code[MAX_LEN_SHORT_DESC]; float tax; float total; } billing_item; @@ -541,11 +535,8 @@ namespace administration { a_err tax_rate_exists(tax_rate data); a_err tax_rate_remove(tax_rate data); - a_err tax_rate_update(tax_rate data); // TODO remove - a_err tax_rate_get_by_shorthandle(tax_rate* buffer, char* handle); // TODO remove - a_err tax_rate_get_by_id(tax_rate* buffer, char* id); // TODO remove - u32 tax_rate_get_all(tax_rate* buffer); - u32 tax_rate_get_by_country(tax_rate* buffer, u32 code_count, char** country_codes); // TODO remove + a_err tax_rate_get_by_internal_code(tax_rate* buffer, char* id); + u32 tax_rate_get_all(tax_rate* buffer, tax_rate_type type); // Cost center functions. // ======================= diff --git a/include/ui.hpp b/include/ui.hpp index 76b5395..92cb8f5 100644 --- a/include/ui.hpp +++ b/include/ui.hpp @@ -110,7 +110,7 @@ namespace ImGui void FormContactTypeCombo(contact_type* type); void FormCostCenterCombo(char* costcenter_id); void FormProjectCombo(char* project_id); - void FormTaxRateCombo(char* tax_rate_id, char* orig_country, char* dest_country, bool has_error); + void FormTaxRateCombo(char* tax_internal_code, bool outgoing, bool has_error); bool FormCurrencyCombo(char* currency); void FormToggleCombo(bool *buffer, char* option1, char* option2); bool DrawWarningIcon(float radius); |