change inv ui for new tax rates

2 files changed, 8 insertions, 23 deletions

diff --git a/tests/administration_validation_tests.cpp b/tests/administration_validation_tests.cpp
index ca523f3..ab235c1 100644
--- a/tests/administration_validation_tests.cpp
+++ b/tests/administration_validation_tests.cpp
@@ -75,20 +75,6 @@ TEST _administration_validate_taxrate_add(void)
     PASS();
 }
 
-TEST _administration_validate_taxrate_update(void)
-{
-    administration::create_empty("");
-    tax_rate p1 = administration::tax_rate_create_empty(); 
-    
-    ASSERT_EQ(administration::tax_rate_add(p1), A_ERR_SUCCESS);
-    ASSERT_EQ(administration::tax_rate_update(p1), A_ERR_SUCCESS);
-
-    strops::copy(p1.id, "-1", sizeof(p1.id));
-    ASSERT_EQ(administration::tax_rate_update(p1), A_ERR_NOT_FOUND);
-
-    PASS();
-}
-
 // Cost center 
 //////////////////
 TEST _administration_validate_costcenter_add(void)
@@ -281,7 +267,6 @@ SUITE(administration_validate) {
     RUN_TEST(_administration_validate_project_isvalid);
 
     RUN_TEST(_administration_validate_taxrate_add);
-    RUN_TEST(_administration_validate_taxrate_update);
 
     RUN_TEST(_administration_validate_costcenter_add);
     RUN_TEST(_administration_validate_costcenter_update);
diff --git a/tests/test_helper.cpp b/tests/test_helper.cpp
index 167cb15..85d228a 100644
--- a/tests/test_helper.cpp
+++ b/tests/test_helper.cpp
@@ -62,7 +62,7 @@ static billing_item _create_bi1(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -81,7 +81,7 @@ static billing_item _create_bi2(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -100,7 +100,7 @@ static billing_item _create_bi3(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -119,7 +119,7 @@ static billing_item _create_bi4(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -138,7 +138,7 @@ static billing_item _create_bi5(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -157,7 +157,7 @@ static billing_item _create_bi6(invoice *inv)
     char* _country_codes[2] = {inv->supplier.address.country_code, inv->customer.address.country_code};
     u32 tax_rate_count = administration::tax_rate_get_by_country(buffer, 2, _country_codes);
     tax_rate rand_rate = buffer[tax_rate_count-1];
-    strops::copy(item.tax_rate_id, rand_rate.id, MAX_LEN_ID);
+    strops::copy(item.tax_internal_code, rand_rate.id, MAX_LEN_ID);
 
     return item;
 }
@@ -172,8 +172,8 @@ static billing_item _create_bi(float amount, float npi, char* taxrate)
     item.discount = 0.0f;
     item.discount_is_percentage = 0;
     tax_rate rate;
-    administration::tax_rate_get_by_shorthandle(&rate, taxrate);
-    strops::copy(item.tax_rate_id, rate.id, MAX_LEN_ID);
+    //administration::tax_rate_get_by_shorthandle(&rate, taxrate);
+    strops::copy(item.tax_internal_code, rate.id, MAX_LEN_ID);
     return item;
 }