3 files changed, 23 insertions, 3 deletions
diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp
index 549273d..fc03e84 100644
--- a/src/ui/ui_contacts.cpp
+++ b/src/ui/ui_contacts.cpp
@@ -48,6 +48,25 @@ void ui_setup_contacts()
     memset(&selected_for_removal, 0, sizeof(contact));
 }
 
+void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false)
+{
+    a_err last_err = administration_addressee_is_valid(*buffer);
+
+    ImGui::PushID(buffer);
+
+    ImGui::Spacing();
+    ImGui::BeginDisabled();
+
+    if (!viewing_only) ImGui::EndDisabled();
+
+    ImGui::FormInputTextWithErrorHint(localize("contact.form.fullname"), buffer->name, IM_ARRAYSIZE(buffer->name), last_err & A_ERR_MISSING_NAME);
+
+    ui_draw_address_form(&buffer->address, last_err);
+
+    if (viewing_only) ImGui::EndDisabled();
+    ImGui::PopID();
+}
+
 void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false)
 {
     a_err last_err = administration_contact_is_valid(*buffer);
@@ -86,7 +105,6 @@ void draw_contact_form(contact* buffer, bool viewing_only = false)
     draw_contact_form_ex(buffer, viewing_only, false);
 }
 
-
 static void draw_contact_list()
 {
     const u32 items_per_page = 50;
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 7dd5add..9094d30 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -34,6 +34,7 @@ static invoice selected_for_removal = {0};
 
 static billing_item* invoice_items_buffer = 0;
 
+void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
 void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false);
 void draw_invoice_items_form(invoice* invoice);
 
@@ -91,7 +92,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
     if (buffer->is_triangulation) {
         ImGui::Spacing();
         ImGui::Text(localize("invoice.form.shippinginformation"));
-        draw_contact_form_ex(&buffer->addressee, 0,0);
+        draw_addressee_form_ex(&buffer->addressee, 0);
     }
     ImGui::Separator();
 
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 6c3e229..0ef3fb2 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -36,6 +36,7 @@ static invoice selected_for_removal = {0};
 static billing_item* invoice_items_buffer = 0;
 
 void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false);
+void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
 
 void ui_destroy_invoices()
 {
@@ -212,7 +213,7 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     if (buffer->is_triangulation) {
         ImGui::Spacing();
         ImGui::Text(localize("invoice.form.shippinginformation"));
-        draw_contact_form_ex(&buffer->addressee, 0,0);
+        draw_addressee_form_ex(&buffer->addressee, 0);
     }
     ImGui::Separator();