diff --git a/agent/modals/ticket/ticket_invoice_add.php b/agent/modals/ticket/ticket_invoice_add.php
index bd213677..df139a3c 100644
--- a/agent/modals/ticket/ticket_invoice_add.php
+++ b/agent/modals/ticket/ticket_invoice_add.php
@@ -54,6 +54,8 @@ if ($ticket_assigned_to) {
     $ticket_assigned_agent = '';
 }
 
+$ticket_quote_id = intval($row['ticket_quote_id']);
+
 $contact_id = intval($row['contact_id']);
 $contact_name = nullable_htmlentities($row['contact_name']);
 
@@ -91,6 +93,12 @@ ob_start();
     <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
     <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
     <div class="modal-body">
+        <?php if ($ticket_quote_id > 0) { ?>
+            <div class="alert alert-warning" role="alert">
+                <a href="quote.php?quote_id=<?=$ticket_quote_id?>">View quote?</a>
+            </div>
+        <?php } ?>
+
         <?php if (mysqli_num_rows($sql_invoices) > 0) { ?>
 
         <ul class="nav nav-pills nav-justified mb-3">
diff --git a/agent/modals/ticket/ticket_quote_add.php b/agent/modals/ticket/ticket_quote_add.php
new file mode 100644
index 00000000..dc165714
--- /dev/null
+++ b/agent/modals/ticket/ticket_quote_add.php
@@ -0,0 +1,239 @@
+<?php
+
+require_once '../../../includes/modal_header.php';
+
+$ticket_id = intval($_GET['ticket_id']);
+
+$ticket_sql = mysqli_query(
+    $mysqli,
+    "SELECT * FROM tickets
+    LEFT JOIN clients ON ticket_client_id = client_id
+    LEFT JOIN contacts ON ticket_contact_id = contact_id
+    LEFT JOIN users ON ticket_assigned_to = user_id
+    LEFT JOIN locations ON ticket_location_id = location_id
+    LEFT JOIN assets ON ticket_asset_id = asset_id
+    LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+    LEFT JOIN categories ON ticket_category = category_id
+    WHERE ticket_id = $ticket_id
+    $access_permission_query
+    LIMIT 1"
+);
+
+$row = mysqli_fetch_assoc($ticket_sql);
+$client_id = intval($row['client_id']);
+$client_rate = floatval($row['client_rate']);
+$ticket_prefix = nullable_htmlentities($row['ticket_prefix']);
+$ticket_number = intval($row['ticket_number']);
+$ticket_category = intval($row['ticket_category']);
+$ticket_category_display = nullable_htmlentities($row['category_name']);
+$ticket_subject = nullable_htmlentities($row['ticket_subject']);
+$ticket_priority = nullable_htmlentities($row['ticket_priority']);
+$ticket_billable = intval($row['ticket_billable']);
+$ticket_onsite = intval($row['ticket_onsite']);
+
+$ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
+$ticket_created_by = intval($row['ticket_created_by']);
+$ticket_date = date('Y-m-d g:i A', strtotime($ticket_created_at));
+$ticket_first_response_at = nullable_htmlentities($row['ticket_first_response_at']);
+if ($ticket_first_response_at) {
+    $ticket_first_response_date_time = date('Y-m-d g:i A', strtotime($ticket_first_response_at));
+} else {
+    $ticket_first_response_date_time = '';
+}
+$ticket_resolved_at = nullable_htmlentities($row['ticket_resolved_at']);
+if ($ticket_resolved_at) {
+    $ticket_resolved_date = date('Y-m-d g:i A', strtotime($ticket_resolved_at));
+} else {
+    $ticket_resolved_date = '';
+}
+
+$ticket_assigned_to = intval($row['ticket_assigned_to']);
+if ($ticket_assigned_to) {
+    $ticket_assigned_agent = nullable_htmlentities($row['user_name']);
+} else {
+    $ticket_assigned_agent = '';
+}
+
+$contact_id = intval($row['contact_id']);
+$contact_name = nullable_htmlentities($row['contact_name']);
+
+$asset_id = intval($row['asset_id']);
+$asset_name = nullable_htmlentities($row['asset_name']);
+$asset_type = nullable_htmlentities($row['asset_type']);
+
+
+
+ob_start();
+
+?>
+
+    <div class="modal-header bg-dark">
+        <h5 class="modal-title"><i class="fa fa-fw fa-comment-dollar mr-2"></i>Quote ticket</h5>
+        <button type="button" class="close text-white" data-dismiss="modal">
+            <span>&times;</span>
+        </button>
+    </div>
+
+    <form action="post.php" method="post" autocomplete="off">
+        <input type="hidden" name="csrf_token" value="<?= $_SESSION['csrf_token'] ?>">
+        <input type="hidden" name="ticket_id" value="<?php echo $ticket_id; ?>">
+
+        <div class="modal-body">
+
+            <!-- Row 1 -->
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>Scope</label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-comment"></i></span>
+                            </div>
+                            <input type="text" class="form-control" name="scope" placeholder="Quick description" maxlength="255">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>Quote Category <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
+                            </div>
+
+                            <select class="form-control select2" name="category">
+                                <option value="">- Select a Category -</option>
+                                <?php
+                                $sql = mysqli_query($mysqli, "SELECT * FROM categories WHERE category_type = 'Income' AND category_archived_at IS NULL ORDER BY category_name ASC");
+                                while ($row = mysqli_fetch_assoc($sql)) {
+                                    $category_id = intval($row['category_id']);
+                                    $category_name = nullable_htmlentities($row['category_name']);
+                                    ?>
+                                    <option value="<?php echo $category_id; ?>"><?php echo $category_name; ?></option>
+                                <?php } ?>
+                            </select>
+
+                            <div class="input-group-append">
+                                <button type="button" class="btn btn-secondary ajax-modal" data-modal-url="/admin/modals/category/category_add.php?category=Expense">
+                                    <i class="fas fa-fw fa-plus"></i>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- End row 1 -->
+
+            <!-- Row 2 -->
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>Quote Date <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="date" max="2999-12-31" value="<?php echo date("Y-m-d"); ?>">
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label>Expire <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
+                            </div>
+                            <input type="date" class="form-control" name="expire" min="<?php echo date("Y-m-d"); ?>" max="2999-12-31" value="<?php echo date("Y-m-d", strtotime("+30 days")); ?>" required>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- End row 2 -->
+
+            <div class="form-group">
+                <label>Item <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-box"></i></span>
+                    </div>
+                    <input type="text" class="form-control" name="item_name" placeholder="Item" required>
+                </div>
+            </div>
+
+            <?php $description = "Ticket: {$ticket_prefix}{$ticket_number} - $ticket_subject\n"; ?>
+
+            <div class="form-group">
+                <label>Item Description</label>
+                <div class="input-group">
+                    <textarea class="form-control" rows="10" name="item_description"><?php echo trim($description); ?></textarea>
+                </div>
+            </div>
+
+            <div class="form-row">
+                <div class="col">
+                    <div class="form-group">
+                        <label>QTY <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-balance-scale"></i></span>
+                            </div>
+                            <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="qty" required>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col">
+                    <div class="form-group">
+                        <label>Price <strong class="text-danger">*</strong></label>
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fa fa-fw fa-dollar-sign"></i></span>
+                            </div>
+                            <input type="text" class="form-control" inputmode="decimal" pattern="-?[0-9]*\.?[0-9]{0,2}" name="price" value="<?php echo number_format($client_rate, 2, '.', ''); ?>" required>
+                        </div>
+                        <small class="form-text text-muted">
+                            Hourly Client rate is <strong><?= numfmt_format_currency($currency_format, $client_rate, $session_company_currency); ?></strong>
+                        </small>
+                    </div>
+                </div>
+            </div>
+
+            <div class="form-group">
+                <label>Tax <strong class="text-danger">*</strong></label>
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text"><i class="fa fa-fw fa-piggy-bank"></i></span>
+                    </div>
+
+                    <select class="form-control select2" name="tax_id" required>
+                        <option value="0">None</option>
+                        <?php
+                        $taxes_sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_archived_at IS NULL ORDER BY tax_name ASC");
+                        while ($row = mysqli_fetch_assoc($taxes_sql)) {
+                            $tax_id_select = intval($row['tax_id']);
+                            $tax_name = nullable_htmlentities($row['tax_name']);
+                            $tax_percent = floatval($row['tax_percent']);
+                            ?>
+                            <option value="<?php echo $tax_id_select; ?>"><?php echo "$tax_name $tax_percent%"; ?></option>
+                        <?php } ?>
+                    </select>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="modal-footer">
+            <button type="submit" name="add_quote_from_ticket" class="btn btn-primary text-bold">
+                <i class="fa fa-check mr-2"></i>Quote
+            </button>
+            <button type="button" class="btn btn-light" data-dismiss="modal">
+                <i class="fa fa-times mr-2"></i>Cancel
+            </button>
+        </div>
+    </form>
+
+<?php
+require_once '../../../includes/modal_footer.php';
diff --git a/agent/post/quote.php b/agent/post/quote.php
index 0e8fd105..c9d108e2 100644
--- a/agent/post/quote.php
+++ b/agent/post/quote.php
@@ -183,6 +183,22 @@ if (isset($_POST['add_quote_to_invoice'])) {
 
     logAction("Invoice", "Create", "$session_name created invoice $config_invoice_prefix$invoice_number from quote $config_quote_prefix$quote_number", $client_id, $new_invoice_id);
 
+    // Check & update any quote-ticket association
+    $ticket_id = 0;
+    $sql_ticket = "SELECT ticket_id, ticket_prefix, ticket_number
+        FROM tickets 
+        WHERE ticket_quote_id = $quote_id 
+        LIMIT 1";
+    $result_ticket = mysqli_query($mysqli, $sql_ticket);
+
+    if ($result_ticket && $row = mysqli_fetch_assoc($result_ticket)) {
+        $ticket_id = intval($row['ticket_id']);
+        $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+        $ticket_number = intval($row['ticket_number']);
+
+        mysqli_query($mysqli, "UPDATE tickets SET ticket_invoice_id = $new_invoice_id WHERE ticket_id = $ticket_id AND ticket_invoice_id = '0'"); // Only if ticket doesn't already have an invoice
+    }
+
     customAction('invoice_create', $new_invoice_id);
 
     flash_alert("Invoice created from quote <strong>$quote_prefix$quote_number</strong>");
diff --git a/agent/post/ticket.php b/agent/post/ticket.php
index 33f1619f..955ac84f 100644
--- a/agent/post/ticket.php
+++ b/agent/post/ticket.php
@@ -2295,6 +2295,79 @@ if (isset($_POST['add_invoice_from_ticket'])) {
 
 }
 
+if (isset($_POST['add_quote_from_ticket'])) {
+
+    validateCSRFToken($_POST['csrf_token']);
+
+    enforceUserPermission('module_support', 2);
+    enforceUserPermission('module_sales', 2);
+
+    require_once 'quote_model.php';
+
+    $ticket_id = intval($_POST['ticket_id']);
+    $item_name = sanitizeInput($_POST['item_name']);
+    $item_description = sanitizeInput($_POST['item_description']);
+    $qty = floatval($_POST['qty']);
+    $price = floatval($_POST['price']);
+    $tax_id = intval($_POST['tax_id']);
+
+    // Totals
+    $subtotal = $price * $qty;
+    $tax_amount = 0;
+    if ($tax_id > 0) {
+        $sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_id = $tax_id");
+        $row = mysqli_fetch_assoc($sql);
+        $tax_percent = floatval($row['tax_percent']);
+        $tax_amount = $subtotal * $tax_percent / 100;
+    }
+    $total = floatval($subtotal + $tax_amount);
+
+    // Ticket info
+    $sql = mysqli_query(
+        $mysqli,
+        "SELECT ticket_prefix, ticket_number, ticket_client_id FROM tickets WHERE ticket_id = $ticket_id LIMIT 1"
+    );
+    $row = mysqli_fetch_assoc($sql);
+    $ticket_prefix = sanitizeInput($row['ticket_prefix']);
+    $ticket_number = intval($row['ticket_number']);
+    $client_id = intval($row['ticket_client_id']);
+
+    // Atomically increment and get the new quote number
+    mysqli_query($mysqli, "
+        UPDATE settings
+        SET
+            config_quote_next_number = LAST_INSERT_ID(config_quote_next_number),
+            config_quote_next_number = config_quote_next_number + 1
+        WHERE company_id = 1
+    ");
+
+    $quote_number = mysqli_insert_id($mysqli);
+
+    //Generate a unique URL key for clients to access
+    $quote_url_key = randomString(32);
+
+    mysqli_query($mysqli,"INSERT INTO quotes SET quote_prefix = '$config_quote_prefix', quote_number = $quote_number, quote_scope = '$scope', quote_date = '$date', quote_expire = '$expire', quote_amount = $total, quote_currency_code = '$session_company_currency', quote_category_id = $category, quote_status = 'Draft', quote_url_key = '$quote_url_key', quote_client_id = $client_id");
+
+    $quote_id = mysqli_insert_id($mysqli);
+
+    // Add line item
+    mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order = 1, item_tax_id = $tax_id, item_quote_id = $quote_id");
+
+    // Add internal note to ticket, and link to invoice in database
+    mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = 'Created quote <a href=\"quote.php?quote_id=$quote_id\">$config_quote_prefix$quote_number</a> for this ticket.', ticket_reply_type = 'Internal', ticket_reply_time_worked = '00:01:00', ticket_reply_by = $session_user_id, ticket_reply_ticket_id = $ticket_id");
+    mysqli_query($mysqli, "UPDATE tickets SET ticket_quote_id = $quote_id WHERE ticket_id = $ticket_id LIMIT 1");
+
+    // Logging + redirects
+    mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Draft', history_description = 'Quote created from Ticket $ticket_prefix$ticket_number!', history_quote_id = $quote_id");
+    logAction("Quote", "Create", "$session_name created quote $config_quote_prefix$quote_number from ticket $ticket_prefix$ticket_number", $client_id, $quote_id);
+
+    customAction('quote_create', $quote_id);
+
+    flash_alert("Quote <strong>$config_quote_prefix$quote_number</strong> created");
+    redirect("quote.php?quote_id=$quote_id");
+
+}
+
 if (isset($_POST['export_tickets_csv'])) {
 
     validateCSRFToken($_POST['csrf_token']);
diff --git a/agent/ticket.php b/agent/ticket.php
index 23740705..c0d3888d 100644
--- a/agent/ticket.php
+++ b/agent/ticket.php
@@ -368,7 +368,13 @@ if (isset($_GET['ticket_id'])) {
                     <div class="card-tools d-print-none">
                         <div class="btn-toolbar">
 
-                            <?php if ($config_module_enable_accounting && $ticket_billable == 1 && empty($invoice_id) && lookupUserPermission("module_sales") >= 2) { ?>
+                            <?php if ($config_module_enable_accounting && $ticket_billable == 1 && empty($quote_id) && empty($invoice_id) && lookupUserPermission("module_sales") >= 2) { ?>
+                            <a href="#" class="btn btn-light btn-sm ml-3 ajax-modal" href="#" data-modal-url="modals/ticket/ticket_quote_add.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg">
+                                <i class="fas fa-fw fa-comment-dollar mr-2"></i>Quote
+                            </a>
+                            <?php }
+
+                            if ($config_module_enable_accounting && $ticket_billable == 1 && empty($invoice_id) && lookupUserPermission("module_sales") >= 2) { ?>
                                 <a href="#" class="btn btn-light btn-sm ml-3 ajax-modal" href="#" data-modal-url="modals/ticket/ticket_invoice_add.php?ticket_id=<?= $ticket_id ?>" data-modal-size="lg">
                                     <i class="fas fa-fw fa-file-invoice mr-2"></i>Invoice
                                 </a>
diff --git a/agent/ticket_list.php b/agent/ticket_list.php
index 38f43d60..294e343a 100644
--- a/agent/ticket_list.php
+++ b/agent/ticket_list.php
@@ -140,6 +140,7 @@
                             }
 
                             $ticket_invoice_id = intval($row['ticket_invoice_id']);
+                            $ticket_quote_id = intval($row['ticket_quote_id']);
 
                             // Get who last updated the ticket - to be shown in the last Response column
 
@@ -236,6 +237,8 @@
                                     <td class="text-center">
                                         <?php if ($ticket_invoice_id) { ?>
                                         <a href="invoice.php?client_id=<?php echo $client_id; ?>&invoice_id=<?php echo $ticket_invoice_id; ?>"><span class='badge badge-pill badge-success p-2'>Invoiced</span></a>
+                                        <?php } else if ($ticket_quote_id) { ?>
+                                            <a href="quote.php?client_id=<?php echo $client_id; ?>&quote_id=<?php echo $ticket_quote_id; ?>"><span class='badge badge-pill badge-primary p-2'>Quoted</span></a>
                                         <?php } else { ?>
                                         <a href="#"
                                             class="ajax-modal"