From 91af76b2e1d89613c1c9b2c509877c6ff1c80f0d Mon Sep 17 00:00:00 2001 From: johnnyq Date: Sat, 21 Nov 2026 00:47:49 -0500 Subject: [PATCH] QoL 48: empty first choices read Select a client where you pick one, Any client where a list is filtered and None or No contact where it can be blank, the same for multi-pick placeholders, the report client and agent pickers and the choices built in script --- CHANGELOG.md | 1 + admin/modals/ai/ai_model_edit.php | 2 +- admin/modals/category/category_form.php | 2 +- .../document_template_required.php | 2 +- .../document_template/document_template_use.php | 2 +- .../document_template_use_several.php | 2 +- admin/modals/office/office.php | 2 +- .../payment_method/payment_method_delete.php | 2 +- .../payment_provider/payment_provider_edit.php | 6 +++--- .../project_template_ticket_template_add.php | 2 +- admin/modals/rmm/rmm_client_link.php | 2 +- admin/modals/rmm/rmm_provider_edit.php | 2 +- .../software_template/software_template_form.php | 2 +- .../software_template_required.php | 2 +- .../software_template/software_template_use.php | 2 +- .../software_template_use_several.php | 2 +- .../ticket_template/ticket_template_form.php | 2 +- admin/modals/user/user_bulk_role.php | 2 +- admin/modals/user/user_form.php | 2 +- admin/modals/user/user_invite_bulk.php | 2 +- admin/modals/user/user_restore.php | 2 +- .../vendor_template/vendor_template_required.php | 2 +- admin/saved_payment_methods.php | 4 ++-- admin/settings_ticket.php | 2 +- admin/sla.php | 2 +- admin/tax_rates.php | 2 +- agent/archived.php | 2 +- agent/assets.php | 10 +++++----- agent/calendar.php | 2 +- agent/certificates.php | 2 +- agent/client_onboarding/billing.php | 2 +- agent/client_onboarding/company.php | 2 +- agent/client_onboarding/locations.php | 2 +- agent/clients.php | 8 ++++---- agent/contacts.php | 6 +++--- agent/contracts.php | 2 +- agent/credentials.php | 6 +++--- agent/dispatch.php | 4 ++-- agent/domains.php | 4 ++-- agent/expense_import.php | 8 ++++---- agent/includes/inc_ticket_template_select.php | 2 +- agent/includes/statement_columns.php | 2 +- agent/income_import.php | 10 +++++----- agent/invoices.php | 2 +- agent/js/ticket_tasks_modal.js | 2 +- agent/js/tickets_add_modal.js | 2 +- agent/locations.php | 4 ++-- agent/modals/account/account_form.php | 2 +- agent/modals/asset/asset_bulk_add_ticket.php | 4 ++-- agent/modals/asset/asset_bulk_assign_contact.php | 2 +- agent/modals/asset/asset_bulk_assign_location.php | 2 +- agent/modals/asset/asset_bulk_edit_status.php | 2 +- agent/modals/asset/asset_bulk_transfer_client.php | 2 +- agent/modals/asset/asset_export.php | 10 +++++----- agent/modals/asset/asset_form.php | 14 +++++++------- agent/modals/billing/billing_form.php | 2 +- agent/modals/calendar/calendar_event.php | 2 +- agent/modals/calendar/calendar_event_form.php | 2 +- agent/modals/certificate/certificate_export.php | 2 +- agent/modals/certificate/certificate_form.php | 2 +- agent/modals/client/client_add.php | 6 +++--- agent/modals/client/client_bulk_add_contract.php | 2 +- agent/modals/client/client_bulk_add_ticket.php | 4 ++-- agent/modals/client/client_bulk_edit_referral.php | 2 +- agent/modals/client/client_credit_add.php | 4 ++-- agent/modals/client/client_edit.php | 4 ++-- agent/modals/client/client_export.php | 6 +++--- .../contact/contact_bulk_assign_location.php | 2 +- agent/modals/contact/contact_export.php | 6 +++--- agent/modals/contact/contact_form.php | 6 +++--- agent/modals/contract/contract_form.php | 4 ++-- agent/modals/contract/contract_recurring.php | 2 +- agent/modals/credential/credential_export.php | 4 ++-- agent/modals/credential/credential_form.php | 2 +- .../modals/document/document_add_from_template.php | 2 +- agent/modals/domain/domain_export.php | 2 +- agent/modals/domain/domain_form.php | 2 +- agent/modals/expense/expense_bulk_edit.php | 4 ++-- agent/modals/expense/expense_form.php | 8 ++++---- agent/modals/expense/expense_reimburse.php | 4 ++-- agent/modals/income/income_bulk_edit.php | 6 +++--- agent/modals/invoice/invoice_bulk.php | 2 +- .../modals/invoice/invoice_bulk_edit_category.php | 2 +- agent/modals/invoice/invoice_export.php | 4 ++-- agent/modals/kb/kb_article_form.php | 2 +- agent/modals/location/location_assign.php | 2 +- agent/modals/location/location_export.php | 4 ++-- agent/modals/location/location_form.php | 6 +++--- agent/modals/network/network_bulk_edit.php | 2 +- agent/modals/network/network_export.php | 2 +- agent/modals/network/network_form.php | 2 +- agent/modals/payment/payment_form.php | 2 +- agent/modals/product/product_export.php | 4 ++-- agent/modals/product/product_form.php | 4 ++-- agent/modals/project/project_apply_template.php | 2 +- agent/modals/project/project_bulk_manager.php | 2 +- agent/modals/project/project_export.php | 2 +- agent/modals/project/project_form.php | 6 +++--- agent/modals/purchasing/po_bill.php | 6 +++--- agent/modals/purchasing/po_new.php | 2 +- agent/modals/rack/rack_form.php | 4 ++-- .../recurring_expense/recurring_expense_form.php | 8 ++++---- .../recurring_invoice/recurring_invoice_export.php | 2 +- .../recurring_ticket/recurring_ticket_add.php | 6 +++--- .../recurring_ticket_bulk_agent_edit.php | 2 +- .../recurring_ticket_bulk_category_edit.php | 2 +- agent/modals/revenue/revenue_form.php | 6 +++--- agent/modals/service/service_export.php | 2 +- agent/modals/service/service_form.php | 2 +- agent/modals/share/share_add.php | 2 +- agent/modals/software/software_export.php | 4 ++-- agent/modals/software/software_form.php | 12 ++++++------ agent/modals/software/software_seats.php | 4 ++-- agent/modals/ticket/ticket_add.php | 8 ++++---- agent/modals/ticket/ticket_add_watcher.php | 2 +- agent/modals/ticket/ticket_bulk_add_project.php | 2 +- agent/modals/ticket/ticket_bulk_assign.php | 2 +- agent/modals/ticket/ticket_bulk_edit_category.php | 2 +- agent/modals/ticket/ticket_contact.php | 2 +- agent/modals/ticket/ticket_edit_asset.php | 2 +- agent/modals/ticket/ticket_edit_project.php | 2 +- agent/modals/ticket/ticket_edit_vendor.php | 2 +- agent/modals/ticket/ticket_export.php | 4 ++-- agent/modals/ticket/ticket_invoice_add.php | 2 +- agent/modals/ticket/ticket_quick.php | 6 +++--- agent/modals/ticket/ticket_quote_add.php | 2 +- agent/modals/ticket/ticket_sla.php | 2 +- agent/modals/ticket/ticket_task_approver_add.php | 6 +++--- agent/modals/transaction/transaction_export.php | 2 +- agent/modals/transfer/transfer_form.php | 6 +++--- agent/modals/trip/trip_bulk_edit.php | 2 +- agent/modals/trip/trip_claim.php | 4 ++-- agent/modals/vendor/vendor_export.php | 4 ++-- agent/modals/vendor/vendor_form.php | 2 +- agent/modals/vendor/vendor_template_clients.php | 2 +- agent/networks.php | 4 ++-- agent/notifications.php | 2 +- agent/products.php | 4 ++-- agent/products_count.php | 2 +- agent/projects.php | 2 +- agent/quotes.php | 2 +- agent/racks.php | 6 +++--- agent/recurring_invoices.php | 2 +- agent/recurring_tickets.php | 2 +- agent/services.php | 4 ++-- agent/shares.php | 2 +- agent/software.php | 10 +++++----- agent/tickets.php | 14 +++++++------- agent/transactions.php | 2 +- agent/unbilled_time.php | 2 +- agent/vendors.php | 4 ++-- functions/api_keys.php | 2 +- functions/calendar_reminders.php | 2 +- functions/reports.php | 6 +++--- functions/tax.php | 2 +- functions/ticket_template.php | 2 +- 156 files changed, 266 insertions(+), 265 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index baaf9bbd8..731fad1df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -220,6 +220,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u - Dates: every date reads one way - Nov 13, 2026, with times as 2:30 PM and the day of the week as Fri, Nov 13 where it shows. The invoice, quote, recurring invoice, expense, income, trip and transaction lists and pages, an asset's and a license's dates, certificates, domains, invoice and quote PDFs, statements and the guest invoice and quote pages showed 2026-11-13; some times read 2:30pm or 14:30, and some emails put the day first, 13 Nov. Pointing at a "3 days ago" shows the date and time the same way. Date fields, exports and file names keep 2026-11-13. - Windows and buttons: a window that makes something new is called New ... and its button says Create, and an edit window is called Edit ..., with the record's name after it in lighter text, and its button says Save - the titles read Editing contact:, Tag:, Creating note: and so on, and the buttons said Add, Add Income, Add Expense, Log Trip, Set Up, Make Draft, Create Client, Save changes and the like. On list pages the button that opens it says New, as New Provider, New Model, New Instance and New Item had said Add. A window that adds to the record it's on - Add Tickets on an invoice, Add keys on a license - still says Add. Field labels sit the same distance above their fields in every window, the extensions on a new client, applying a project template and adding ticket templates to one have their icon in front like every other field, invoices have one icon everywhere, and deleting a client is a normal window with Delete at the bottom, turned on once the client's name is typed. - Menus, icons and questions: every More menu has the same ⋮ button, and Delete, Restore and Export each have one icon everywhere. The required-field star sits the same way on every form, and Incident response has the usual dark window with its warning in red. A question before an action names it on its button - Delete, Remove, Archive - rather than Yes. Resetting a ticket's timer, removing an approval request, redacting with nothing selected and a window that fails to open now use ITFlow's own question and message rather than the browser's. Every list's search box reads Search ..., with what it looks in shown when you point at it. +- Dropdowns: the empty first choice reads the same way everywhere - - Select a client -, - Select an account - and so on where you pick one, - Any client -, - Any status - where a list is filtered, and - None -, - No contact -, - Nobody - where it can be left blank. They had said - Select Client -, - Pick a role -, - Which account -, - How it was paid -, - All Clients -, Not Assigned and the like. ### Bug Fixes diff --git a/admin/modals/ai/ai_model_edit.php b/admin/modals/ai/ai_model_edit.php index 0d83a2ca4..a718ec5de 100644 --- a/admin/modals/ai/ai_model_edit.php +++ b/admin/modals/ai/ai_model_edit.php @@ -73,7 +73,7 @@ ob_start();
- + $kind_config) { ?> diff --git a/admin/modals/document_template/document_template_required.php b/admin/modals/document_template/document_template_required.php index ed3c52a31..8528aa96c 100644 --- a/admin/modals/document_template/document_template_required.php +++ b/admin/modals/document_template/document_template_required.php @@ -54,7 +54,7 @@ if (!$template) { ?>
- diff --git a/admin/modals/document_template/document_template_use.php b/admin/modals/document_template/document_template_use.php index aa8e474a3..61b26727d 100644 --- a/admin/modals/document_template/document_template_use.php +++ b/admin/modals/document_template/document_template_use.php @@ -39,7 +39,7 @@ if (!$template || $template['document_template_archived_at']) { ?>
+ - + diff --git a/admin/modals/payment_method/payment_method_delete.php b/admin/modals/payment_method/payment_method_delete.php index 246dfcc4b..28acefc8a 100644 --- a/admin/modals/payment_method/payment_method_delete.php +++ b/admin/modals/payment_method/payment_method_delete.php @@ -44,7 +44,7 @@ if (!$payment_method) { ?>
- + @@ -186,7 +186,7 @@ ob_start();
- + diff --git a/admin/modals/project_template/project_template_ticket_template_add.php b/admin/modals/project_template/project_template_ticket_template_add.php index bc4e97796..f4675ed5d 100644 --- a/admin/modals/project_template/project_template_ticket_template_add.php +++ b/admin/modals/project_template/project_template_ticket_template_add.php @@ -38,7 +38,7 @@ ob_start();
- + diff --git a/admin/modals/software_template/software_template_form.php b/admin/modals/software_template/software_template_form.php index 0194d3b79..ac3962624 100644 --- a/admin/modals/software_template/software_template_form.php +++ b/admin/modals/software_template/software_template_form.php @@ -70,7 +70,7 @@ while ($row = mysqli_fetch_assoc($sql)) {
diff --git a/admin/modals/software_template/software_template_required.php b/admin/modals/software_template/software_template_required.php index ea2ebb27e..ab38eeb70 100644 --- a/admin/modals/software_template/software_template_required.php +++ b/admin/modals/software_template/software_template_required.php @@ -53,7 +53,7 @@ if (!$template) { ?>
- diff --git a/admin/modals/software_template/software_template_use.php b/admin/modals/software_template/software_template_use.php index 545846dff..3916546bb 100644 --- a/admin/modals/software_template/software_template_use.php +++ b/admin/modals/software_template/software_template_use.php @@ -43,7 +43,7 @@ if (!$template || $template['software_template_archived_at']) { ?>
+ + - + $role) { ?> diff --git a/admin/modals/user/user_form.php b/admin/modals/user/user_form.php index 5efb18e7f..2ee254da7 100644 --- a/admin/modals/user/user_form.php +++ b/admin/modals/user/user_form.php @@ -92,7 +92,7 @@ $value = function ($key) use ($form) { - + $role) { if ($role['role_archived_at']) { diff --git a/admin/modals/user/user_restore.php b/admin/modals/user/user_restore.php index 8c363e91a..e4cbed4cf 100644 --- a/admin/modals/user/user_restore.php +++ b/admin/modals/user/user_restore.php @@ -60,7 +60,7 @@ ob_start(); + - + @@ -124,7 +124,7 @@ $page_title = 'Saved Cards';
- + $choice) { ?> diff --git a/admin/tax_rates.php b/admin/tax_rates.php index 07044ccdb..e09fc1a88 100644 --- a/admin/tax_rates.php +++ b/admin/tax_rates.php @@ -206,7 +206,7 @@ $sort_link = function ($column, $label) use ($url_query_strings_sort, $sort, $di
- + diff --git a/agent/assets.php b/agent/assets.php index 9bb77dd16..302fb5984 100644 --- a/agent/assets.php +++ b/agent/assets.php @@ -288,7 +288,7 @@ $search_noun = $type_filter ? $asset_type_tabs[$type_filter]['label'] : 'assets'
- +
-
- + diff --git a/agent/certificates.php b/agent/certificates.php index 705bf89f5..35b8b2322 100644 --- a/agent/certificates.php +++ b/agent/certificates.php @@ -186,7 +186,7 @@ $export_extra = [
> +
diff --git a/agent/client_onboarding/locations.php b/agent/client_onboarding/locations.php index 82831563c..974650798 100644 --- a/agent/client_onboarding/locations.php +++ b/agent/client_onboarding/locations.php @@ -67,7 +67,7 @@ $co_country = (string) settingsValue('country', $session_company_country);
+ - +
@@ -489,7 +489,7 @@ $total_leads = intval($row['leads']);
- +
+ - +
- - + - + diff --git a/agent/domains.php b/agent/domains.php index 6494259a7..9e738a01c 100644 --- a/agent/domains.php +++ b/agent/domains.php @@ -181,7 +181,7 @@ $bulk_vendor_options = $can_edit ? domainVendorChoices($client_url ? $client_id
-
- + $row) { ?> @@ -110,7 +110,7 @@ $steps = ['upload' => 'Statement', 'columns' => 'Columns', 'review' => 'Review']
- + @@ -325,7 +325,7 @@ $steps = ['upload' => 'Statement', 'columns' => 'Columns', 'review' => 'Review'] diff --git a/agent/includes/inc_ticket_template_select.php b/agent/includes/inc_ticket_template_select.php index c1b2a2ee3..10d7840a4 100644 --- a/agent/includes/inc_ticket_template_select.php +++ b/agent/includes/inc_ticket_template_select.php @@ -57,7 +57,7 @@ while ($row = mysqli_fetch_row($sql_ticket_template_tags)) {
'; - $html .= ''; + $html .= ''; foreach ($header as $c => $label) { $html .= ''; } diff --git a/agent/income_import.php b/agent/income_import.php index 42a2be8fc..d786b3ee5 100644 --- a/agent/income_import.php +++ b/agent/income_import.php @@ -95,7 +95,7 @@ $steps = ['upload' => 'Statement', 'columns' => 'Columns', 'review' => 'Review']
- + @@ -350,7 +350,7 @@ $steps = ['upload' => 'Statement', 'columns' => 'Columns', 'review' => 'Review']
@@ -358,7 +358,7 @@ $steps = ['upload' => 'Statement', 'columns' => 'Columns', 'review' => 'Review']
- +
Money moved between your accounts - not income.
diff --git a/agent/invoices.php b/agent/invoices.php index ef234cc93..4561246b4 100644 --- a/agent/invoices.php +++ b/agent/invoices.php @@ -261,7 +261,7 @@ $stat_money = function ($amount) use ($session_company_currency) {
- +
- - + @@ -77,7 +77,7 @@ ob_start();
- + - + diff --git a/agent/modals/asset/asset_bulk_transfer_client.php b/agent/modals/asset/asset_bulk_transfer_client.php index 9ab7ed77c..2f057b310 100644 --- a/agent/modals/asset/asset_bulk_transfer_client.php +++ b/agent/modals/asset/asset_bulk_transfer_client.php @@ -32,7 +32,7 @@ ob_start();
- + $tab) { ?> @@ -81,7 +81,7 @@ ob_start();
- +
@@ -134,7 +134,7 @@ ob_start();
-
diff --git a/agent/modals/asset/asset_form.php b/agent/modals/asset/asset_form.php index ed9f7ed5c..48b01f0e1 100644 --- a/agent/modals/asset/asset_form.php +++ b/agent/modals/asset/asset_form.php @@ -151,7 +151,7 @@ $asset_form_icons = [
- + $asset_icon_select) { ?> @@ -192,7 +192,7 @@ $asset_form_icons = [
@@ -209,7 +209,7 @@ $asset_form_icons = [
- >
@@ -332,7 +332,7 @@ $asset_form_icons = [
- + @@ -471,7 +471,7 @@ $asset_form_icons = [
- + $form_edit ? $form_value('created_at') : null]) ?> diff --git a/agent/modals/calendar/calendar_event.php b/agent/modals/calendar/calendar_event.php index e5ee44857..501ee63dd 100644 --- a/agent/modals/calendar/calendar_event.php +++ b/agent/modals/calendar/calendar_event.php @@ -129,7 +129,7 @@ ob_start();
- $row) { ?> diff --git a/agent/modals/calendar/calendar_event_form.php b/agent/modals/calendar/calendar_event_form.php index 9e16b0394..fcf5e417b 100644 --- a/agent/modals/calendar/calendar_event_form.php +++ b/agent/modals/calendar/calendar_event_form.php @@ -46,7 +46,7 @@ $form_agents = calendarEventAgentChoices($form_attendees['agents']);
- $row) { ?> diff --git a/agent/modals/certificate/certificate_export.php b/agent/modals/certificate/certificate_export.php index 3ce848b96..acf7091ec 100644 --- a/agent/modals/certificate/certificate_export.php +++ b/agent/modals/certificate/certificate_export.php @@ -59,7 +59,7 @@ ob_start();
- + diff --git a/agent/modals/client/client_add.php b/agent/modals/client/client_add.php index eb2786ba9..e13663c55 100644 --- a/agent/modals/client/client_add.php +++ b/agent/modals/client/client_add.php @@ -77,7 +77,7 @@ ob_start();
@@ -96,7 +96,7 @@ ob_start();
- >
@@ -143,7 +143,7 @@ ob_start();
- + $template) { ?> diff --git a/agent/modals/client/client_bulk_add_ticket.php b/agent/modals/client/client_bulk_add_ticket.php index fb1aa204e..6fadff26c 100644 --- a/agent/modals/client/client_bulk_add_ticket.php +++ b/agent/modals/client/client_bulk_add_ticket.php @@ -63,7 +63,7 @@ ob_start();
@@ -81,7 +81,7 @@ ob_start();
- + diff --git a/agent/modals/client/client_credit_add.php b/agent/modals/client/client_credit_add.php index 7c9a218c8..792802070 100644 --- a/agent/modals/client/client_credit_add.php +++ b/agent/modals/client/client_credit_add.php @@ -22,7 +22,7 @@
- + @@ -129,7 +129,7 @@ ob_start();
- >
diff --git a/agent/modals/client/client_export.php b/agent/modals/client/client_export.php index ddba9abcb..641af59f5 100644 --- a/agent/modals/client/client_export.php +++ b/agent/modals/client/client_export.php @@ -75,7 +75,7 @@ ob_start();
- + Tags
-
diff --git a/agent/modals/contact/contact_bulk_assign_location.php b/agent/modals/contact/contact_bulk_assign_location.php index 643e1da44..7ed7212a0 100644 --- a/agent/modals/contact/contact_bulk_assign_location.php +++ b/agent/modals/contact/contact_bulk_assign_location.php @@ -29,7 +29,7 @@ ob_start();
- + +
diff --git a/agent/modals/contact/contact_form.php b/agent/modals/contact/contact_form.php index 23d51f702..c1f8f6bf0 100644 --- a/agent/modals/contact/contact_form.php +++ b/agent/modals/contact/contact_form.php @@ -70,7 +70,7 @@ $contact_roles = [
- + @@ -259,7 +259,7 @@ $contact_roles = [
- >
diff --git a/agent/modals/contract/contract_form.php b/agent/modals/contract/contract_form.php index 932938c41..c62d1f5d8 100644 --- a/agent/modals/contract/contract_form.php +++ b/agent/modals/contract/contract_form.php @@ -133,7 +133,7 @@ $tab = 'contractTab' . bin2hex(random_bytes(3));
- + $owner) { ?> diff --git a/agent/modals/contract/contract_recurring.php b/agent/modals/contract/contract_recurring.php index 9fc13c2da..5c84fc4e2 100644 --- a/agent/modals/contract/contract_recurring.php +++ b/agent/modals/contract/contract_recurring.php @@ -94,7 +94,7 @@ if ($refuse !== '') { ?>
diff --git a/agent/modals/credential/credential_export.php b/agent/modals/credential/credential_export.php index 53a6a60a1..4e54be2c2 100644 --- a/agent/modals/credential/credential_export.php +++ b/agent/modals/credential/credential_export.php @@ -56,7 +56,7 @@ ob_start();
+
diff --git a/agent/modals/credential/credential_form.php b/agent/modals/credential/credential_form.php index bad05ff05..42fbdffd4 100644 --- a/agent/modals/credential/credential_form.php +++ b/agent/modals/credential/credential_form.php @@ -70,7 +70,7 @@ $form_id = 'credentialForm' . ($credential_form_mode === 'edit' ? $credential_id
- + $template) { $used = $usage[$template_id]['count'] ?? 0; $about = trim(implode(' · ', array_filter([isset($missing[$template_id]) ? 'this client should have one' : '', trim((string) $template['document_template_description']), $used ? 'used ' . $used . ' time' . ($used === 1 ? '' : 's') : '']))); ?> diff --git a/agent/modals/domain/domain_export.php b/agent/modals/domain/domain_export.php index 4ba7831bb..192fd31f8 100644 --- a/agent/modals/domain/domain_export.php +++ b/agent/modals/domain/domain_export.php @@ -60,7 +60,7 @@ ob_start();
- + diff --git a/agent/modals/expense/expense_bulk_edit.php b/agent/modals/expense/expense_bulk_edit.php index 4b3626308..b3abe04a3 100644 --- a/agent/modals/expense/expense_bulk_edit.php +++ b/agent/modals/expense/expense_bulk_edit.php @@ -54,13 +54,13 @@ ob_start(); > - + $vendor) { ?> @@ -146,7 +146,7 @@ $form_markup = $form_row && !$form_refund ? floatval($form_row['expense_markup']
@@ -180,7 +180,7 @@ $form_markup = $form_row && !$form_refund ? floatval($form_row['expense_markup'] $form_business_account = $form_edit && !$form_paid_by && isset($form_accounts[$form_account]) ? $form_account : bookkeepingAccount('expense'); ?> - + $account) { ?> @@ -203,7 +203,7 @@ $form_markup = $form_row && !$form_refund ? floatval($form_row['expense_markup']
- + $account) { ?> @@ -90,7 +90,7 @@ ob_start();
- + ['Account Transfer']]) ?> - + diff --git a/agent/modals/invoice/invoice_bulk_edit_category.php b/agent/modals/invoice/invoice_bulk_edit_category.php index fc178a5a2..57afb409e 100644 --- a/agent/modals/invoice/invoice_bulk_edit_category.php +++ b/agent/modals/invoice/invoice_bulk_edit_category.php @@ -27,7 +27,7 @@ ob_start();
diff --git a/agent/modals/invoice/invoice_export.php b/agent/modals/invoice/invoice_export.php index 65a369b80..94f47a063 100644 --- a/agent/modals/invoice/invoice_export.php +++ b/agent/modals/invoice/invoice_export.php @@ -56,7 +56,7 @@ ob_start();
- +
diff --git a/agent/modals/kb/kb_article_form.php b/agent/modals/kb/kb_article_form.php index 26b1b8fd2..aa9758f58 100644 --- a/agent/modals/kb/kb_article_form.php +++ b/agent/modals/kb/kb_article_form.php @@ -105,7 +105,7 @@ $kb_form_audience = $kb_form_mode === 'edit' ? kbAudienceFields($kb_form) : ['vi
- Which ?
- data-assign-select=""> +
diff --git a/agent/modals/location/location_form.php b/agent/modals/location/location_form.php index 230eb5dcd..10b5c4375 100644 --- a/agent/modals/location/location_form.php +++ b/agent/modals/location/location_form.php @@ -62,7 +62,7 @@ $form_id = 'locationForm' . ($location_form_mode === 'edit' ? $location_id : 'Ne
- >
@@ -156,7 +156,7 @@ $form_id = 'locationForm' . ($location_form_mode === 'edit' ? $location_id : 'Ne
- + diff --git a/agent/modals/network/network_export.php b/agent/modals/network/network_export.php index 2a3c07ed0..bf3a97384 100644 --- a/agent/modals/network/network_export.php +++ b/agent/modals/network/network_export.php @@ -60,7 +60,7 @@ ob_start();
- + diff --git a/agent/modals/payment/payment_form.php b/agent/modals/payment/payment_form.php index a7628215d..87d1ebfb4 100644 --- a/agent/modals/payment/payment_form.php +++ b/agent/modals/payment/payment_form.php @@ -60,7 +60,7 @@ $pay_lock = $pay['lock'] ?? null;
- +
@@ -84,7 +84,7 @@ ob_start();
- + @@ -153,7 +153,7 @@ if ($form_vendor_id && !isset($form_vendors[$form_vendor_id]) && $form_value('ve
- + diff --git a/agent/modals/project/project_bulk_manager.php b/agent/modals/project/project_bulk_manager.php index a37f232e0..49fa6bf06 100644 --- a/agent/modals/project/project_bulk_manager.php +++ b/agent/modals/project/project_bulk_manager.php @@ -30,7 +30,7 @@ ob_start();
- + - + - +
@@ -75,7 +75,7 @@ ob_start();
- + diff --git a/agent/modals/purchasing/po_new.php b/agent/modals/purchasing/po_new.php index 88091d3eb..1aa02c976 100644 --- a/agent/modals/purchasing/po_new.php +++ b/agent/modals/purchasing/po_new.php @@ -53,7 +53,7 @@ ob_start();
- + Categories - one the rack has that is archived or isn't a type any more stays an option, or the required select would change it on every edit ?> @@ -89,7 +89,7 @@ isset($mysqli) || die("Direct file access is not allowed");
- + $vendor) { ?> @@ -144,7 +144,7 @@ while ($row = mysqli_fetch_assoc($sql)) {
@@ -203,7 +203,7 @@ while ($row = mysqli_fetch_assoc($sql)) {
- + diff --git a/agent/modals/recurring_invoice/recurring_invoice_export.php b/agent/modals/recurring_invoice/recurring_invoice_export.php index ac8f9fe31..9670f6622 100644 --- a/agent/modals/recurring_invoice/recurring_invoice_export.php +++ b/agent/modals/recurring_invoice/recurring_invoice_export.php @@ -56,7 +56,7 @@ ob_start();
diff --git a/agent/modals/recurring_ticket/recurring_ticket_add.php b/agent/modals/recurring_ticket/recurring_ticket_add.php index 16cb17f78..43cdce071 100644 --- a/agent/modals/recurring_ticket/recurring_ticket_add.php +++ b/agent/modals/recurring_ticket/recurring_ticket_add.php @@ -63,7 +63,7 @@ ob_start();
- + @@ -188,7 +188,7 @@ ob_start();
- + diff --git a/agent/modals/revenue/revenue_form.php b/agent/modals/revenue/revenue_form.php index cc7f033f3..6b4347c3a 100644 --- a/agent/modals/revenue/revenue_form.php +++ b/agent/modals/revenue/revenue_form.php @@ -63,7 +63,7 @@ $form_currency = $form_account ? ($form_accounts[$form_account]['account_currenc
@@ -91,7 +91,7 @@ $form_currency = $form_account ? ($form_accounts[$form_account]['account_currenc
- + diff --git a/agent/modals/service/service_export.php b/agent/modals/service/service_export.php index af2332242..20847faa2 100644 --- a/agent/modals/service/service_export.php +++ b/agent/modals/service/service_export.php @@ -91,7 +91,7 @@ ob_start();
- + diff --git a/agent/modals/share/share_add.php b/agent/modals/share/share_add.php index 312b0ba58..86d107692 100644 --- a/agent/modals/share/share_add.php +++ b/agent/modals/share/share_add.php @@ -173,7 +173,7 @@ ob_start();
- diff --git a/agent/modals/software/software_export.php b/agent/modals/software/software_export.php index d6dfe2fe3..9a0677f1b 100644 --- a/agent/modals/software/software_export.php +++ b/agent/modals/software/software_export.php @@ -63,7 +63,7 @@ ob_start();
- + $status_option) { ?> diff --git a/agent/modals/software/software_form.php b/agent/modals/software/software_form.php index e686e098f..9d3c561d5 100644 --- a/agent/modals/software/software_form.php +++ b/agent/modals/software/software_form.php @@ -119,7 +119,7 @@ $form_id = 'softwareForm' . ($software_form_mode === 'edit' ? $software_id : 'Ne
- + @@ -181,7 +181,7 @@ $form_id = 'softwareForm' . ($software_form_mode === 'edit' ? $software_id : 'Ne
- + @@ -285,7 +285,7 @@ $form_id = 'softwareForm' . ($software_form_mode === 'edit' ? $software_id : 'Ne
- @@ -297,7 +297,7 @@ $form_id = 'softwareForm' . ($software_form_mode === 'edit' ? $software_id : 'Ne
- diff --git a/agent/modals/software/software_seats.php b/agent/modals/software/software_seats.php index e62d541fb..5f8df62ab 100644 --- a/agent/modals/software/software_seats.php +++ b/agent/modals/software/software_seats.php @@ -59,8 +59,8 @@ ob_start();
['label' => 'Users', 'icon' => 'fa-user', 'placeholder' => $contact_options ? 'Pick the people licensed to use it' : 'This client has no contacts yet'], - 'assets' => ['label' => 'Devices', 'icon' => 'fa-desktop', 'placeholder' => $asset_options ? 'Pick the devices it is installed on' : 'This client has no assets yet'], + 'contacts' => ['label' => 'Users', 'icon' => 'fa-user', 'placeholder' => $contact_options ? '- Select the people licensed to use it -' : 'This client has no contacts yet'], + 'assets' => ['label' => 'Devices', 'icon' => 'fa-desktop', 'placeholder' => $asset_options ? '- Select the devices it is installed on -' : 'This client has no assets yet'], ]; if (!$users_first) { $pickers = array_reverse($pickers, true); diff --git a/agent/modals/ticket/ticket_add.php b/agent/modals/ticket/ticket_add.php index bd3f3e3c0..ecfc34bc5 100644 --- a/agent/modals/ticket/ticket_add.php +++ b/agent/modals/ticket/ticket_add.php @@ -157,7 +157,7 @@ ob_start();
- +
@@ -228,7 +228,7 @@ ob_start();
@@ -356,7 +356,7 @@ ob_start();
-
diff --git a/agent/modals/ticket/ticket_add_watcher.php b/agent/modals/ticket/ticket_add_watcher.php index de6e969ea..4ec6c7750 100644 --- a/agent/modals/ticket/ticket_add_watcher.php +++ b/agent/modals/ticket/ticket_add_watcher.php @@ -28,7 +28,7 @@ ob_start();
- + - + diff --git a/agent/modals/ticket/ticket_contact.php b/agent/modals/ticket/ticket_contact.php index bd53baf25..623b29d10 100644 --- a/agent/modals/ticket/ticket_contact.php +++ b/agent/modals/ticket/ticket_contact.php @@ -38,7 +38,7 @@ ob_start();
- + - + - + ''") ?>
diff --git a/agent/modals/ticket/ticket_invoice_add.php b/agent/modals/ticket/ticket_invoice_add.php index 11d3b60c1..905de249f 100644 --- a/agent/modals/ticket/ticket_invoice_add.php +++ b/agent/modals/ticket/ticket_invoice_add.php @@ -135,7 +135,7 @@ ob_start();
diff --git a/agent/modals/ticket/ticket_quick.php b/agent/modals/ticket/ticket_quick.php index cb04e4d54..dccf96bd8 100644 --- a/agent/modals/ticket/ticket_quick.php +++ b/agent/modals/ticket/ticket_quick.php @@ -53,7 +53,7 @@ ob_start();
- +
Type a name, an email address or a phone number to find them.
diff --git a/agent/modals/ticket/ticket_quote_add.php b/agent/modals/ticket/ticket_quote_add.php index 5f3e7d715..2f484620a 100644 --- a/agent/modals/ticket/ticket_quote_add.php +++ b/agent/modals/ticket/ticket_quote_add.php @@ -112,7 +112,7 @@ ob_start(); diff --git a/agent/modals/ticket/ticket_sla.php b/agent/modals/ticket/ticket_sla.php index 7214b4d63..b89df961b 100644 --- a/agent/modals/ticket/ticket_sla.php +++ b/agent/modals/ticket/ticket_sla.php @@ -34,7 +34,7 @@ ob_start();
- + @@ -67,7 +67,7 @@ ob_start();
@@ -159,7 +159,7 @@ ob_start(); return res.json(); }) .then(function (data) { - var pairs = [['', 'Select user...']]; + var pairs = [['', '- Select a user -']]; data.users.forEach(function (u) { pairs.push([u.user_id, u.user_name]); }); diff --git a/agent/modals/transaction/transaction_export.php b/agent/modals/transaction/transaction_export.php index 16c3e6253..ce4d6448b 100644 --- a/agent/modals/transaction/transaction_export.php +++ b/agent/modals/transaction/transaction_export.php @@ -64,7 +64,7 @@ ob_start();
> - + @@ -95,7 +95,7 @@ $form_account_options = function ($selected) use ($form_accounts, $form_types) {
@@ -136,7 +136,7 @@ $form_account_options = function ($selected) use ($form_accounts, $form_types) {
- + $driver) { ?> diff --git a/agent/modals/trip/trip_claim.php b/agent/modals/trip/trip_claim.php index 598aef403..c2fa1e9eb 100644 --- a/agent/modals/trip/trip_claim.php +++ b/agent/modals/trip/trip_claim.php @@ -101,7 +101,7 @@ ob_start();
- + diff --git a/agent/modals/vendor/vendor_export.php b/agent/modals/vendor/vendor_export.php index dea8d8c82..da4d08d23 100644 --- a/agent/modals/vendor/vendor_export.php +++ b/agent/modals/vendor/vendor_export.php @@ -62,7 +62,7 @@ ob_start();
+
diff --git a/agent/modals/vendor/vendor_form.php b/agent/modals/vendor/vendor_form.php index 58fa6c187..47834a607 100644 --- a/agent/modals/vendor/vendor_form.php +++ b/agent/modals/vendor/vendor_form.php @@ -83,7 +83,7 @@ $form_id = 'vendorForm' . ($vendor_form_mode === 'edit' ? $vendor_id : 'New');
> + - +
-
diff --git a/agent/notifications.php b/agent/notifications.php index 9abd74905..5ba86e89f 100644 --- a/agent/notifications.php +++ b/agent/notifications.php @@ -95,7 +95,7 @@ $empty_state_skip = true;
- +
- + diff --git a/agent/projects.php b/agent/projects.php index fc5a9dc63..8fb769d6b 100644 --- a/agent/projects.php +++ b/agent/projects.php @@ -204,7 +204,7 @@ $hidden_filter_count = $date_filter_active ? 1 : 0;
- + $row) {
- + $row) {
- +
-
- +
- + '' AND $archive_query @@ -301,7 +301,7 @@ while ($license_type_row = mysqli_fetch_row($sql_license_types)) {
- + @@ -317,7 +317,7 @@ while ($license_type_row = mysqli_fetch_row($sql_license_types)) {
-
diff --git a/agent/tickets.php b/agent/tickets.php index acea467a2..f28fec838 100644 --- a/agent/tickets.php +++ b/agent/tickets.php @@ -351,7 +351,7 @@ $export_extra = [
+ - + @@ -453,14 +453,14 @@ $export_extra = [
+
@@ -482,7 +482,7 @@ $export_extra = [
- + $account] : []) as $id => $option) { ?> diff --git a/agent/unbilled_time.php b/agent/unbilled_time.php index a5cb333ba..e7c655f64 100644 --- a/agent/unbilled_time.php +++ b/agent/unbilled_time.php @@ -542,7 +542,7 @@ $hours_text = function ($hours) {
diff --git a/agent/vendors.php b/agent/vendors.php index 7b54a33d5..42ab19161 100644 --- a/agent/vendors.php +++ b/agent/vendors.php @@ -181,7 +181,7 @@ $missing_templates = $view === 'client' && !$archived ? vendorTemplatesMissingFo
+ - + $agent) { ?> diff --git a/functions/calendar_reminders.php b/functions/calendar_reminders.php index 122d4cd2d..9522cbbb2 100644 --- a/functions/calendar_reminders.php +++ b/functions/calendar_reminders.php @@ -58,7 +58,7 @@ function calendarReminderFromInput($value) { /** The options of a reminder picker, the one set picked - "No reminder" first. HTML. */ function calendarReminderOptions($minutes) { - $html = ''; + $html = ''; foreach (CALENDAR_REMINDER_CHOICES as $value => $label) { $html .= ''; } diff --git a/functions/reports.php b/functions/reports.php index 6b198303b..5f52c32a2 100644 --- a/functions/reports.php +++ b/functions/reports.php @@ -1184,14 +1184,14 @@ function reportYearControl($year, array $years) { } /** The client picker - every client this user may see, or one. */ -function reportClientControl($client_id, $all_label = 'All clients', $required = false) { +function reportClientControl($client_id, $all_label = 'Any client', $required = false) { global $mysqli; $client_id = intval($client_id); $sql = mysqli_query($mysqli, "SELECT client_id, client_name, client_abbreviation FROM clients WHERE (client_archived_at IS NULL OR client_id = $client_id)" . clientNotLeadSql($client_id) . clientScopeSql('client_id') . " ORDER BY client_name ASC"); $html = '
'; + $control = '