1 files changed, 3 insertions, 20 deletions
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 94b0b36..6d1b36c 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -289,24 +289,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
 
     // 7. Supplier information
     ImGui::Text(localize("invoice.form.supplier"));
-    bool on_autocomplete;
-    draw_contact_form_ex(&buffer->supplier, false, true, &on_autocomplete);
-
-    if (on_autocomplete) {
-        strops_copy(buffer->supplier_id, buffer->supplier.id, sizeof(buffer->supplier_id));
-    }
-    
-    // Check if contact info is equal to contact stored in customer id, in case we select from dropdown and edit data after,
-    // this should be handled as a new contact and supplier_id should be set to "" so we create a new contact.
-    contact lookup_buffer;
-    if (administration_contact_get_by_id(&lookup_buffer, buffer->supplier_id))
-    {
-        if (!administration_contact_equals(lookup_buffer, buffer->supplier))
-        {
-            buffer->supplier_id[0] = '\0';
-            buffer->supplier.id[0] = '\0';
-        }
-    }
+    draw_contact_form_ex(&buffer->supplier, false, true, 0);
 
     // 8. (optional) shipping address.
     ImGui::Checkbox(localize("invoice.form.triangulation"), &buffer->is_triangulation);
@@ -360,8 +343,9 @@ static void ui_draw_expenses_list()
 
     invoice invoice_list[items_per_page];
     u32 invoice_count = administration_invoice_get_partial_list_incomming(current_page, items_per_page, invoice_list);
+    u32 total_invoice_count = administation_invoice_get_incomming_count();
 
-    s32 max_page = (invoice_count + items_per_page - 1) / items_per_page;
+    s32 max_page = (total_invoice_count + items_per_page - 1) / items_per_page;
     if (max_page == 0) max_page = 1;
 
     // Table header controls: create button and pagination.
@@ -372,7 +356,6 @@ static void ui_draw_expenses_list()
         active_invoice.customer = administration_company_info_get();
         active_invoice.is_outgoing = 0;
         active_invoice.status = invoice_status::INVOICE_RECEIVED;
-        strops_copy(active_invoice.customer_id, active_invoice.customer.id, sizeof(active_invoice.customer_id));
     }
 
     if (current_page >= max_page-1) current_page = max_page-1;