diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fc9a7dccba..84863fa2fa 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -86,10 +86,6 @@ Layout/ExtraSpacing:
     - 'Guardfile'
     - 'app/models/barcode_item.rb'
     - 'app/queries/items_by_storage_collection_query.rb'
-    - 'app/queries/items_in_query.rb'
-    - 'app/queries/items_in_total_query.rb'
-    - 'app/queries/items_out_query.rb'
-    - 'app/queries/items_out_total_query.rb'
     - 'config/environments/development.rb'
     - 'config/environments/test.rb'
     - 'config/puma.rb'
@@ -169,10 +165,6 @@ Layout/MultilineMethodCallIndentation:
     - 'app/models/partner_distribution.rb'
     - 'app/models/storage_location.rb'
     - 'app/queries/items_by_storage_collection_query.rb'
-    - 'app/queries/items_in_query.rb'
-    - 'app/queries/items_in_total_query.rb'
-    - 'app/queries/items_out_query.rb'
-    - 'app/queries/items_out_total_query.rb'
     - 'app/services/reports/acquisition_report_service.rb'
     - 'app/services/reports/adult_incontinence_report_service.rb'
     - 'app/services/reports/children_served_report_service.rb'
diff --git a/app/controllers/storage_locations_controller.rb b/app/controllers/storage_locations_controller.rb
index 620c3a40df..469e03fb32 100644
--- a/app/controllers/storage_locations_controller.rb
+++ b/app/controllers/storage_locations_controller.rb
@@ -54,15 +54,12 @@ def edit
     @storage_location = current_organization.storage_locations.find(params[:id])
   end
 
-  # TODO: Move these queries to Query Object
   def show
+    setup_date_range_picker
     @storage_location = current_organization.storage_locations.find(params[:id])
     version_date = params[:version_date].presence&.to_date
-    # TODO: Find a way to do these with less hard SQL. These queries have to be manually updated because they're not in-sync with the Model
-    @items_out = ItemsOutQuery.new(organization: current_organization, storage_location: @storage_location).call
-    @items_out_total = ItemsOutTotalQuery.new(organization: current_organization, storage_location: @storage_location).call
-    @items_in = ItemsInQuery.new(organization: current_organization, storage_location: @storage_location).call
-    @items_in_total = ItemsInTotalQuery.new(organization: current_organization, storage_location: @storage_location).call
+    @flow = ItemsFlowQuery.new(organization: current_organization, storage_location: @storage_location,
+      date_range: helpers.selected_range).call
     if View::Inventory.within_snapshot?(current_organization.id, version_date)
       @inventory = View::Inventory.new(current_organization.id, event_time: version_date)
     else
diff --git a/app/events/audit_event.rb b/app/events/audit_event.rb
index aab873ada2..f065c7f81d 100644
--- a/app/events/audit_event.rb
+++ b/app/events/audit_event.rb
@@ -14,4 +14,9 @@ def self.publish(audit)
       )
     )
   end
+
+  # Sets quantities outright rather than editing an earlier version.
+  def is_edit?
+    false
+  end
 end
diff --git a/app/events/inventory_aggregate.rb b/app/events/inventory_aggregate.rb
index bfc6a2bdff..e561add670 100644
--- a/app/events/inventory_aggregate.rb
+++ b/app/events/inventory_aggregate.rb
@@ -34,14 +34,13 @@ def inventory_for(organization_id, event_time: nil, validate: false)
       event_hash = {}
       events.group_by(&:group_id).each do |_, event_batch|
         last_grouped_event = event_batch.max_by(&:updated_at)
-        # don't do grouping for UpdateExistingEvents
-        if event_batch.any? { |e| e.is_a?(UpdateExistingEvent) }
-          handle(last_grouped_event, inventory, validate: validate)
-          yield last_grouped_event, inventory if block_given?
-          next
+        previous_event = nil
+        # only edits are diffed against the previous version of their record
+        if last_grouped_event.is_edit?
+          key = [last_grouped_event.eventable_type, last_grouped_event.eventable_id]
+          previous_event = event_hash[key]
+          event_hash[key] = last_grouped_event
         end
-        previous_event = event_hash[[last_grouped_event.eventable_type, last_grouped_event.eventable_id]]
-        event_hash[[last_grouped_event.eventable_type, last_grouped_event.eventable_id]] = last_grouped_event
         handle(last_grouped_event, inventory, validate: validate, previous_event: previous_event)
         yield last_grouped_event, inventory if block_given?
       end
diff --git a/app/events/kit_allocate_event.rb b/app/events/kit_allocate_event.rb
index aa34b0c078..2ffe82ccdf 100644
--- a/app/events/kit_allocate_event.rb
+++ b/app/events/kit_allocate_event.rb
@@ -30,4 +30,9 @@ def self.publish(kit, storage_location, quantity)
       )
     )
   end
+
+  # Each allocation is its own change rather than an edit of the kit.
+  def is_edit?
+    false
+  end
 end
diff --git a/app/events/kit_deallocate_event.rb b/app/events/kit_deallocate_event.rb
index 88521212e1..6f13f1ae39 100644
--- a/app/events/kit_deallocate_event.rb
+++ b/app/events/kit_deallocate_event.rb
@@ -30,4 +30,9 @@ def self.publish(kit, storage_location, quantity)
       )
     )
   end
+
+  # Each deallocation is its own change rather than an edit of the kit.
+  def is_edit?
+    false
+  end
 end
diff --git a/app/events/update_existing_event.rb b/app/events/update_existing_event.rb
index 90133e2e39..99e311f898 100644
--- a/app/events/update_existing_event.rb
+++ b/app/events/update_existing_event.rb
@@ -60,4 +60,10 @@ def publish(itemizable, previous_line_items, original_storage_location)
       )
     end
   end
+
+  # Carries the difference from the previous version rather than a full
+  # version, so it is applied on its own instead of replacing an earlier event.
+  def is_edit?
+    false
+  end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 44d9972948..a368e11106 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -54,6 +54,14 @@ def no_intervening_snapshot
     end
   end
 
+  # Whether events of this type edit their record: each one is a full version
+  # of the eventable (e.g. a donation, then each later edit of it) that replaces
+  # the previous event for that record, rather than a standalone change.
+  # @return [Boolean]
+  def is_edit?
+    true
+  end
+
   # @return [Array<Option>]
   def self.types_for_select
     descendants.map do |klass|
diff --git a/app/queries/items_flow_query.rb b/app/queries/items_flow_query.rb
new file mode 100644
index 0000000000..ed91935079
--- /dev/null
+++ b/app/queries/items_flow_query.rb
@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+# Summarizes how each item's quantity at a storage location changed over a
+# date range: quantity at start, in, out, adjustments/audits, and at end.
+#
+# Numbers are reported "as of now": an edit or deletion is backdated to when
+# the record was first created, so a donation of 100 that was later edited to
+# 150 shows 150 on its original date, and a deleted donation shows nothing.
+#
+# To do this we replay the inventory once (the same replay used everywhere
+# else, so audits, kits and edits are handled exactly as InventoryAggregate
+# handles them) and total up the net change each record made to each item at
+# this location, dated to when the record was first created. Records from
+# before the range make up the start quantity and records within it make up
+# the in, out and adjustment columns, so start + change always equals end.
+class ItemsFlowQuery
+  Result = Data.define(:rows, :totals)
+
+  # How one item's quantity moved over the date range. The totals row has no
+  # item.
+  Row = Data.define(:item_id, :item_name, :quantity_start, :quantity_in, :quantity_out, :quantity_adjustment) do
+    # @param rows [Array<Row>]
+    # @return [Row]
+    def self.total(rows)
+      new(
+        item_id: nil,
+        item_name: nil,
+        quantity_start: rows.sum(&:quantity_start),
+        quantity_in: rows.sum(&:quantity_in),
+        quantity_out: rows.sum(&:quantity_out),
+        quantity_adjustment: rows.sum(&:quantity_adjustment)
+      )
+    end
+
+    def change
+      quantity_in - quantity_out + quantity_adjustment
+    end
+
+    def quantity_end
+      quantity_start + change
+    end
+
+    def empty?
+      [quantity_start, quantity_in, quantity_out, quantity_adjustment].all?(&:zero?)
+    end
+  end
+
+  ADJUSTMENT_TYPES = %w[AdjustmentEvent AuditEvent].freeze
+
+  # @param organization [Organization]
+  # @param storage_location [StorageLocation]
+  # @param date_range [Range<Time>, nil] nil means everything since the last snapshot
+  def initialize(organization:, storage_location:, date_range: nil)
+    @organization = organization
+    @storage_location = storage_location
+    @date_range = date_range
+  end
+
+  # @return [Result]
+  def call
+    snapshot_quantities, records = replay
+    changes_by_item = records.flat_map(&:item_changes).group_by(&:item_id)
+
+    item_ids = (snapshot_quantities.keys + changes_by_item.keys).uniq
+    names = Item.where(id: item_ids).pluck(:id, :name).to_h
+
+    rows = item_ids.filter_map do |item_id|
+      row = build_row(item_id, names[item_id], snapshot_quantities.fetch(item_id, 0), changes_by_item.fetch(item_id, []))
+      row unless row.empty?
+    end.sort_by { |row| row.item_name.to_s }
+
+    Result.new(rows: rows, totals: Row.total(rows))
+  end
+
+  private
+
+  # The net change a record made to one item at this location.
+  ItemChange = Data.define(:item_id, :time, :adjustment, :quantity)
+
+  # Everything one record (e.g. a donation and all of its edits) changed at
+  # this location, dated to when the record was first created.
+  class RecordChanges
+    def initialize(time:, adjustment:)
+      @time = time
+      @adjustment = adjustment
+      @previous_item_ids = []
+      @quantities = Hash.new(0)
+    end
+
+    # Records the items a new version of the record touches. An edit can
+    # remove an item, so the items the previous version touched may have
+    # changed too.
+    # @param item_ids [Array<Integer>]
+    # @return [Array<Integer>] the items this version or the previous one touched
+    def touch(item_ids)
+      touched = @previous_item_ids | item_ids
+      @previous_item_ids = item_ids
+      touched
+    end
+
+    # @param item_id [Integer]
+    # @param quantity [Integer]
+    def add(item_id, quantity)
+      @quantities[item_id] += quantity
+    end
+
+    # @return [Array<ItemChange>]
+    def item_changes
+      @quantities.filter_map do |item_id, quantity|
+        next if quantity.zero?
+
+        ItemChange.new(item_id: item_id, time: @time, adjustment: @adjustment, quantity: quantity)
+      end
+    end
+  end
+  private_constant :ItemChange, :RecordChanges
+
+  # Replays the inventory, totalling up the change each record made to each
+  # item at this location.
+  # @return [Array(Hash<Integer, Integer>, Array<RecordChanges>)] quantities at
+  #   the snapshot the replay started from, and each record's changes since
+  def replay
+    snapshot_quantities = {}
+    quantities = Hash.new(0) # item_id => quantity after the last event
+    records = {}
+
+    InventoryAggregate.inventory_for(@organization.id) do |event, inventory|
+      items = inventory.storage_locations[@storage_location.id]&.items || {}
+      if event.is_a?(SnapshotEvent)
+        snapshot_quantities = items.transform_values(&:quantity)
+        quantities = Hash.new(0).merge(snapshot_quantities)
+        next
+      end
+
+      key = event.is_edit? ? [event.eventable_type, event.eventable_id] : [:event, event.id]
+      record = records[key] ||= RecordChanges.new(time: event.event_time, adjustment: ADJUSTMENT_TYPES.include?(event.type))
+      record.touch(item_ids_here(event)).each do |item_id|
+        quantity = items[item_id]&.quantity.to_i
+        record.add(item_id, quantity - quantities[item_id])
+        quantities[item_id] = quantity
+      end
+    end
+
+    [snapshot_quantities, records.values]
+  end
+
+  # @return [Array<Integer>] the items the event moves into or out of this location
+  def item_ids_here(event)
+    event.data.items.filter_map do |line_item|
+      line_item.item_id if [line_item.to_storage_location, line_item.from_storage_location].include?(@storage_location.id)
+    end
+  end
+
+  # @param snapshot_quantity [Integer]
+  # @param changes [Array<ItemChange>] the item's changes since the snapshot
+  # @return [Row]
+  def build_row(item_id, item_name, snapshot_quantity, changes)
+    before = changes.select { |change| before_range?(change.time) }
+    adjustments, moves = changes.select { |change| in_range?(change.time) }.partition(&:adjustment)
+    ins, outs = moves.partition { |change| change.quantity.positive? }
+
+    Row.new(
+      item_id: item_id,
+      item_name: item_name,
+      quantity_start: snapshot_quantity + before.sum(&:quantity),
+      quantity_in: ins.sum(&:quantity),
+      quantity_out: -outs.sum(&:quantity),
+      quantity_adjustment: adjustments.sum(&:quantity)
+    )
+  end
+
+  def before_range?(time)
+    !@date_range.nil? && time < @date_range.begin
+  end
+
+  def in_range?(time)
+    @date_range.nil? || @date_range.cover?(time)
+  end
+end
diff --git a/app/queries/items_in_query.rb b/app/queries/items_in_query.rb
deleted file mode 100644
index 5792d8b8da..0000000000
--- a/app/queries/items_in_query.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Creates a query object for retrieving the items, grouped by storage location
-# We're using query objects for some of these more complicated queries to get
-# the raw SQL out of the models and encapsulate it.
-class ItemsInQuery
-  attr_reader :organization
-  attr_reader :filter_params
-  attr_reader :storage_location
-
-  def initialize(organization:, storage_location:, filter_params: nil)
-    @organization = organization
-    @storage_location = storage_location
-    @filter_params = filter_params
-  end
-
-  # rubocop:disable Naming/MemoizedInstanceVariableName
-  def call
-    @items ||=  LineItem.joins("
-LEFT OUTER JOIN donations ON donations.id = line_items.itemizable_id AND line_items.itemizable_type = 'Donation'
-LEFT OUTER JOIN purchases ON purchases.id = line_items.itemizable_id AND line_items.itemizable_type = 'Purchase'
-LEFT OUTER JOIN items ON items.id = line_items.item_id
-LEFT OUTER JOIN adjustments ON adjustments.id = line_items.itemizable_id AND line_items.itemizable_type = 'Adjustment'
-LEFT OUTER JOIN transfers ON transfers.id = line_items.itemizable_id AND line_items.itemizable_type = 'Transfer'")
-                        .where("(donations.storage_location_id = :id or purchases.storage_location_id = :id or (adjustments.storage_location_id = :id and line_items.quantity > 0) or transfers.to_id = :id)  and items.organization_id = :organization_id", id: @storage_location.id, organization_id: @organization.id)
-                        .select("sum(line_items.quantity) as quantity, items.id AS item_id, items.name")
-                        .group("items.name, items.id")
-                        .order("items.name")
-  end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
-end
diff --git a/app/queries/items_in_total_query.rb b/app/queries/items_in_total_query.rb
deleted file mode 100644
index fa6dc3f23b..0000000000
--- a/app/queries/items_in_total_query.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Creates a query object for retrieving the items, grouped by storage location
-# We're using query objects for some of these more complicated queries to get
-# the raw SQL out of the models and encapsulate it.
-class ItemsInTotalQuery
-  attr_reader :organization
-  attr_reader :filter_params
-  attr_reader :storage_location
-
-  def initialize(organization:, storage_location:, filter_params: nil)
-    @organization = organization
-    @storage_location = storage_location
-    @filter_params = filter_params
-  end
-
-  # rubocop:disable Naming/MemoizedInstanceVariableName
-  def call
-    @items ||=  LineItem.joins("
-LEFT OUTER JOIN donations ON donations.id = line_items.itemizable_id AND line_items.itemizable_type = 'Donation'
-LEFT OUTER JOIN purchases ON purchases.id = line_items.itemizable_id AND line_items.itemizable_type = 'Purchase'
-LEFT OUTER JOIN items ON items.id = line_items.item_id
-LEFT OUTER JOIN adjustments ON adjustments.id = line_items.itemizable_id AND line_items.itemizable_type = 'Adjustment'
-LEFT OUTER JOIN transfers ON transfers.id = line_items.itemizable_id AND line_items.itemizable_type = 'Transfer'")
-                        .where("(donations.storage_location_id = :id or purchases.storage_location_id = :id or (adjustments.storage_location_id = :id and line_items.quantity > 0) or transfers.to_id = :id)  and items.organization_id = :organization_id", id: @storage_location.id, organization_id: @organization.id)
-                        .sum("line_items.quantity")
-  end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
-end
-
-
diff --git a/app/queries/items_out_query.rb b/app/queries/items_out_query.rb
deleted file mode 100644
index 016245c6b2..0000000000
--- a/app/queries/items_out_query.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Creates a query object for retrieving the items, grouped by storage location
-# We're using query objects for some of these more complicated queries to get
-# the raw SQL out of the models and encapsulate it.
-class ItemsOutQuery
-  attr_reader :organization
-  attr_reader :filter_params
-  attr_reader :storage_location
-
-  def initialize(organization:, storage_location:, filter_params: nil)
-    @organization = organization
-    @storage_location = storage_location
-    @filter_params = filter_params
-  end
-
-  # rubocop:disable Naming/MemoizedInstanceVariableName
-  def call
-    @items ||=  LineItem.joins("
-LEFT OUTER JOIN distributions ON distributions.id = line_items.itemizable_id AND line_items.itemizable_type = 'Distribution'
-LEFT OUTER JOIN items ON items.id = line_items.item_id
-LEFT OUTER JOIN adjustments ON adjustments.id = line_items.itemizable_id AND line_items.itemizable_type = 'Adjustment'
-LEFT OUTER JOIN transfers ON transfers.id = line_items.itemizable_id AND line_items.itemizable_type = 'Transfer'")
-  .where("(distributions.storage_location_id = :id or (adjustments.storage_location_id= :id and line_items.quantity < 0) or transfers.from_id = :id) and items.organization_id= :organization_id",
-    id: @storage_location.id, organization_id: @organization.id)
-    .select("sum( case when line_items.quantity < 0 then -1*line_items.quantity else line_items.quantity END ) as quantity, items.id AS item_id, items.name")
-    .group("items.name, items.id")
-    .order("items.name")
-  end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
-end
diff --git a/app/queries/items_out_total_query.rb b/app/queries/items_out_total_query.rb
deleted file mode 100644
index ad0d39e124..0000000000
--- a/app/queries/items_out_total_query.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Creates a query object for retrieving the items, grouped by storage location
-# We're using query objects for some of these more complicated queries to get
-# the raw SQL out of the models and encapsulate it.
-class ItemsOutTotalQuery
-  attr_reader :organization
-  attr_reader :filter_params
-  attr_reader :storage_location
-
-  def initialize(organization:, storage_location:, filter_params: nil)
-    @organization = organization
-    @storage_location = storage_location
-    @filter_params = filter_params
-  end
-
-  # rubocop:disable Naming/MemoizedInstanceVariableName
-  def call
-    @items ||=  LineItem.joins("
-LEFT OUTER JOIN distributions ON distributions.id = line_items.itemizable_id AND line_items.itemizable_type = 'Distribution'
-LEFT OUTER JOIN items ON items.id = line_items.item_id
-LEFT OUTER JOIN adjustments ON adjustments.id = line_items.itemizable_id AND line_items.itemizable_type = 'Adjustment'
-LEFT OUTER JOIN transfers ON transfers.id = line_items.itemizable_id AND line_items.itemizable_type = 'Transfer'")
-                        .where("(distributions.storage_location_id = :id or (adjustments.storage_location_id= :id and line_items.quantity < 0) or transfers.from_id = :id) and items.organization_id= :organization_id", id: @storage_location.id, organization_id: @organization.id)
-                        .sum("case when line_items.quantity < 0 then -1*line_items.quantity else line_items.quantity END")
-  end
-  # rubocop:enable Naming/MemoizedInstanceVariableName
-end
diff --git a/app/views/storage_locations/_item_row.html.erb b/app/views/storage_locations/_item_row.html.erb
new file mode 100644
index 0000000000..530d23e1f8
--- /dev/null
+++ b/app/views/storage_locations/_item_row.html.erb
@@ -0,0 +1,9 @@
+<tr id="<%= item_row.item_id %>">
+  <td><%= link_to item_row.item_name, item_path(item_row.item_id) %></td>
+  <td><%= item_row.quantity_start %></td>
+  <td><%= item_row.quantity_in %></td>
+  <td><%= item_row.quantity_out %></td>
+  <td><%= item_row.quantity_adjustment %></td>
+  <td class="<%= 'modal-body-warning-text' if item_row.change.negative? %>"><%= item_row.change %></td>
+  <td><%= item_row.quantity_end %></td>
+</tr>
diff --git a/app/views/storage_locations/_line_item_row.html.erb b/app/views/storage_locations/_line_item_row.html.erb
deleted file mode 100644
index 3f0dd8b7bf..0000000000
--- a/app/views/storage_locations/_line_item_row.html.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-<tr>
-  <td><%= link_to line_item_row.name, item_path(line_item_row.item_id) %></td>
-  <td><%= line_item_row.quantity %></td>
-</tr>
diff --git a/app/views/storage_locations/show.html.erb b/app/views/storage_locations/show.html.erb
index 066dc3a7ec..4074f846bc 100644
--- a/app/views/storage_locations/show.html.erb
+++ b/app/views/storage_locations/show.html.erb
@@ -67,28 +67,25 @@
         <!-- Default box -->
         <div class="card card-primary card-outline card-outline-tabs">
           <div class="card-header p-0 border-bottom-0">
+            <% show_flow_tab = params.dig(:filters, :date_range).present? %>
             <ul class="nav nav-tabs" id="custom-tabs-three-tab" role="tablist">
-              <li class="nav-item" class="active">
-                <a class="nav-link active" id="custom-tabs-inventory-tab" data-bs-toggle="pill" href="#custom-tabs-inventory" role="tab" aria-controls="custom-tabs-one-home-tab" aria-selected="true">Inventory</a>
-              </li>
               <li class="nav-item">
-                <a class="nav-link" id="custom-tabs-inventory-in-tab" data-bs-toggle="pill" href="#custom-tabs-inventory-in" role="tab" aria-controls="custom-tabs-two-home-tab" aria-selected="false">Inventory Coming In</a>
+                <a class="nav-link <%= 'active' unless show_flow_tab %>" id="custom-tabs-inventory-tab" data-bs-toggle="pill" href="#custom-tabs-inventory" role="tab" aria-controls="custom-tabs-one-home-tab" aria-selected="<%= !show_flow_tab %>">Inventory</a>
               </li>
               <li class="nav-item">
-                <a class="nav-link" id="custom-tabs-inventory-out-tab" data-bs-toggle="pill" href="#custom-tabs-inventory-out" role="tab" aria-controls="custom-tabs-three-home-tab" aria-selected="false">Inventory Going Out</a>
+                <a class="nav-link <%= 'active' if show_flow_tab %>" id="custom-tabs-inventory-flow-tab" data-bs-toggle="pill" href="#custom-tabs-inventory-flow" role="tab" aria-controls="custom-tabs-two-home-tab" aria-selected="<%= show_flow_tab %>">Inventory Flow</a>
               </li>
             </ul>
           </div>
           <div class="card-body">
             <div class="tab-content" id="custom-tabs-three-tabContent">
 
-              <div class="tab-pane fade show active" id="custom-tabs-inventory" role="tabpanel" aria-labelledby="custom-tabs-one-home-tab">
+              <div class="tab-pane fade <%= 'show active' unless show_flow_tab %>" id="custom-tabs-inventory" role="tabpanel" aria-labelledby="custom-tabs-one-home-tab">
                 <%= form_for @storage_location, method: :get do %>
                   Show Inventory at Date: <%= date_field_tag 'version_date', params[:version_date], min: InventoryItem::EARLIEST_VERSION, autocomplete: "on" %>
                   <%= filter_button(text: 'View') %>
                   <br><small>(historical data collected since <%= Date.parse(InventoryItem::EARLIEST_VERSION).strftime("%b %-d, %Y") %>)</small>
                 <% end %>
-                <br><br>
                 <table class="table">
                   <thead>
                   <tr>
@@ -131,41 +128,43 @@
                 </table>
               </div><!-- /.box-body.table-responsive -->
 
-              <div class="tab-pane fade show" id="custom-tabs-inventory-in" role="tabpanel" aria-labelledby="custom-two-home-tab">
-                <table class="table">
-                  <thead>
-                  <tr>
-                    <th>Item</th>
-                    <th>Quantity</th>
-                  </tr>
-                  </thead>
-                  <tbody>
-                  <%= render partial: "line_item_row", collection: @items_in %>
-                  </tbody>
-                  <tfoot>
-                  <tr>
-                    <td>Total</td>
-                    <td><%= @items_in_total %></td>
-                  </tr>
-                  </tfoot>
-                </table>
-              </div><!-- /.box-body.table-responsive -->
-
-              <div class="tab-pane fade show" id="custom-tabs-inventory-out" role="tabpanel" aria-labelledby="custom-tabs-three-home-tab">
+              <div class="tab-pane fade <%= 'show active' if show_flow_tab %>" id="custom-tabs-inventory-flow" role="tabpanel" aria-labelledby="custom-two-home-tab">
+                <%= form_for @storage_location, method: :get do %>
+                  <%= label_tag "Date Range" %>
+                  <div class="row mb-4">
+                    <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
+                      <%= render partial: "shared/date_range_picker", locals: {css_class: "form-control"} %>
+                    </div>
+                    <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
+                      <%= filter_button %>
+                      <%= clear_filter_button %>
+                    </div>
+                  </div>
+                <% end %>
                 <table class="table">
                   <thead>
                   <tr>
                     <th>Item</th>
-                    <th>Quantity</th>
+                    <th>Quantity at Start</th>
+                    <th>Quantity In</th>
+                    <th>Quantity Out</th>
+                    <th>Quantity Adjustment/Audit</th>
+                    <th>Quantity Change</th>
+                    <th>Quantity at End</th>
                   </tr>
                   </thead>
                   <tbody>
-                  <%= render partial: "line_item_row", collection: @items_out %>
+                  <%= render partial: "item_row", collection: @flow.rows %>
                   </tbody>
                   <tfoot>
                   <tr>
                     <td>Total</td>
-                    <td><%= @items_out_total %></td>
+                    <td><%= @flow.totals.quantity_start %></td>
+                    <td><%= @flow.totals.quantity_in %></td>
+                    <td><%= @flow.totals.quantity_out %></td>
+                    <td><%= @flow.totals.quantity_adjustment %></td>
+                    <td class="<%= 'modal-body-warning-text' if @flow.totals.change.negative? %>"><%= @flow.totals.change %></td>
+                    <td><%= @flow.totals.quantity_end %></td>
                   </tr>
                   </tfoot>
                 </table>
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 64a3e689e1..faf5a75653 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -102,4 +102,16 @@
       }.to raise_error(ActiveRecord::RecordInvalid, /Cannot change inventory for an distribution created before #{1.day.ago.to_date}/)
     end
   end
+
+  describe "#is_edit?" do
+    it "is true for events that edit their record" do
+      expect([DonationEvent, DistributionEvent, AdjustmentEvent, TransferEvent, DonationDestroyEvent].map { |klass| klass.new.is_edit? })
+        .to all(be(true))
+    end
+
+    it "is false for standalone events" do
+      expect([KitAllocateEvent, KitDeallocateEvent, AuditEvent, UpdateExistingEvent].map { |klass| klass.new.is_edit? })
+        .to all(be(false))
+    end
+  end
 end
diff --git a/spec/queries/items_flow_query_spec.rb b/spec/queries/items_flow_query_spec.rb
new file mode 100644
index 0000000000..61cdda3f15
--- /dev/null
+++ b/spec/queries/items_flow_query_spec.rb
@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+RSpec.describe ItemsFlowQuery do
+  let(:organization) { create(:organization) }
+  let(:storage_location) { create(:storage_location, organization: organization) }
+  let(:date_range) { nil }
+
+  subject(:result) { described_class.new(organization: organization, storage_location: storage_location, date_range: date_range).call }
+
+  def rows_by_item
+    result.rows.index_by(&:item_id)
+  end
+
+  def donate(item, quantity)
+    create(:donation, :with_items, item: item, item_quantity: quantity, storage_location: storage_location, organization: organization)
+  end
+
+  def month(year, month)
+    Time.zone.local(year, month, 1).all_month
+  end
+
+  context "with donations, distributions, adjustments, transfers and audits" do
+    let(:items) { create_list(:item, 2, organization: organization) }
+
+    before do
+      donate(items[0], 10)
+      distribution = create(:distribution, :with_items, item: items[0], item_quantity: 5, storage_location: storage_location, organization: organization)
+      DistributionEvent.publish(distribution)
+      donate(items[1], 3)
+      adjustment = create(:adjustment, :with_items, item: items[1], item_quantity: 3, storage_location: storage_location, organization: organization)
+      AdjustmentEvent.publish(adjustment)
+      transfer = create(:transfer, :with_items, item: items[1], item_quantity: 2, from: storage_location,
+        to: create(:storage_location, organization: organization), organization: organization)
+      TransferEvent.publish(transfer)
+      # counts 3 when there are 4, so it contributes -1
+      audit = create(:audit, :with_items, item: items[1], item_quantity: 3, adjustment: adjustment, storage_location: storage_location, organization: organization)
+      AuditEvent.publish(audit)
+    end
+
+    it "sorts each item's changes into in, out and adjustment columns" do
+      expect(result.rows).to contain_exactly(
+        have_attributes(item_id: items[0].id, item_name: items[0].name, quantity_start: 0, quantity_in: 10, quantity_out: 5,
+          quantity_adjustment: 0, change: 5, quantity_end: 5),
+        have_attributes(item_id: items[1].id, item_name: items[1].name, quantity_start: 0, quantity_in: 3, quantity_out: 2,
+          quantity_adjustment: 2, change: 3, quantity_end: 3)
+      )
+      expect(result.totals).to have_attributes(quantity_start: 0, quantity_in: 13, quantity_out: 7, quantity_adjustment: 2,
+        change: 8, quantity_end: 8)
+    end
+  end
+
+  context "with a date range" do
+    let(:items) { create_list(:item, 2, organization: organization) }
+    let(:date_range) { month(2026, 2) }
+
+    before do
+      travel_to(Time.zone.local(2026, 1, 15)) { donate(items[1], 8) }
+      travel_to(Time.zone.local(2026, 2, 10)) do
+        donate(items[0], 10)
+        distribution = create(:distribution, :with_items, item: items[1], item_quantity: 5, storage_location: storage_location, organization: organization)
+        DistributionEvent.publish(distribution)
+      end
+      travel_to(Time.zone.local(2026, 3, 5)) { donate(items[0], 4) }
+    end
+
+    it "counts flows inside the range and quantities at its start and end" do
+      expect(rows_by_item[items[0].id]).to have_attributes(quantity_start: 0, quantity_in: 10, quantity_out: 0, quantity_end: 10)
+      expect(rows_by_item[items[1].id]).to have_attributes(quantity_start: 8, quantity_in: 0, quantity_out: 5, quantity_end: 3)
+    end
+  end
+
+  context "when a donation is edited after it was made" do
+    let(:item) { create(:item, organization: organization) }
+
+    before do
+      travel_to(Time.zone.local(2026, 1, 15)) { @donation = donate(item, 100) }
+      travel_to(Time.zone.local(2026, 3, 15)) do
+        @donation.line_items.first.update!(quantity: 150)
+        DonationEvent.publish(@donation.reload)
+      end
+    end
+
+    context "in the range when it was made" do
+      let(:date_range) { month(2026, 1) }
+
+      it "counts the edited quantity on the original date" do
+        expect(rows_by_item[item.id]).to have_attributes(quantity_start: 0, quantity_in: 150, change: 150, quantity_end: 150)
+      end
+    end
+
+    context "in the range when it was edited" do
+      let(:date_range) { month(2026, 3) }
+
+      it "shows no flow for the edit" do
+        expect(rows_by_item[item.id]).to have_attributes(quantity_start: 150, quantity_in: 0, quantity_out: 0, quantity_end: 150)
+      end
+    end
+  end
+
+  context "when an edit removes an item" do
+    let(:items) { create_list(:item, 2, organization: organization) }
+
+    before do
+      donation = create(:donation, organization: organization, storage_location: storage_location,
+        line_items_attributes: items.map { |item| {item_id: item.id, quantity: 5} })
+      DonationEvent.publish(donation)
+      donation.line_items.find_by(item_id: items[1].id).destroy!
+      DonationEvent.publish(donation.reload)
+    end
+
+    it "does not list the removed item" do
+      expect(rows_by_item.keys).to eq([items[0].id])
+    end
+  end
+
+  context "when successive edits each replace the donated item" do
+    let(:items) { create_list(:item, 3, organization: organization) }
+
+    before do
+      donation = donate(items[0], 5)
+      items.drop(1).each do |item|
+        donation.line_items.first.update!(item_id: item.id)
+        DonationEvent.publish(donation.reload)
+      end
+    end
+
+    it "only counts the item from the latest edit" do
+      expect(result.rows).to contain_exactly(have_attributes(item_id: items[2].id, quantity_in: 5, quantity_end: 5))
+    end
+  end
+
+  context "when an edit moves a donation to another storage location" do
+    let(:item) { create(:item, organization: organization) }
+    let(:other_location) { create(:storage_location, organization: organization) }
+
+    before do
+      donation = donate(item, 5)
+      donation.update!(storage_location: other_location)
+      DonationEvent.publish(donation.reload)
+    end
+
+    it "counts it only at the new location" do
+      expect(result.rows).to be_empty
+      other_result = described_class.new(organization: organization, storage_location: other_location).call
+      expect(other_result.rows).to contain_exactly(have_attributes(item_id: item.id, quantity_in: 5, quantity_end: 5))
+    end
+  end
+
+  context "when a donation is destroyed" do
+    let(:item) { create(:item, organization: organization) }
+    let(:date_range) { month(2026, 1) }
+
+    before do
+      travel_to(Time.zone.local(2026, 1, 15)) { @donation = donate(item, 10) }
+      travel_to(Time.zone.local(2026, 3, 15)) { DonationDestroyEvent.publish(@donation) }
+    end
+
+    it "does not count it, even in the range it was made" do
+      expect(result.rows).to be_empty
+    end
+  end
+
+  context "with kit allocations" do
+    let(:content_item) { create(:item, organization: organization) }
+    let(:kit) do
+      kit_params = {
+        organization_id: organization.id,
+        name: "Flow Test Kit",
+        line_items_attributes: [{item_id: content_item.id, quantity: 2}]
+      }
+      KitCreateService.new(organization_id: organization.id, kit_params: kit_params).tap(&:call).kit
+    end
+
+    it "counts kit contents flowing out and assembled kits flowing in" do
+      donate(content_item, 10)
+      KitAllocateEvent.publish(kit, storage_location.id, 3)
+
+      expect(rows_by_item[kit.id]).to have_attributes(quantity_in: 3, quantity_end: 3)
+      expect(rows_by_item[content_item.id]).to have_attributes(quantity_in: 10, quantity_out: 6, quantity_end: 4)
+    end
+  end
+end
diff --git a/spec/queries/items_in_query_spec.rb b/spec/queries/items_in_query_spec.rb
deleted file mode 100644
index 25632c92e7..0000000000
--- a/spec/queries/items_in_query_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# Spec for /app/queries/items_in_query.rb
-
-RSpec.describe ItemsInQuery do
-  let(:organization) { create(:organization) }
-  let!(:storage_location) { create(:storage_location, organization: organization) }
-  let(:other_item) { create(:item, organization: organization) }
-  let!(:other_storage_location) { create(:storage_location, :with_items, item: other_item, item_quantity: 10, organization: organization) }
-
-  subject { ItemsInQuery.new(storage_location: storage_location, organization: organization).call }
-
-  describe "items_in" do
-    before do
-      create_list(:donation, 2, :with_items, item: create(:item, organization: organization), item_quantity: 5, storage_location: storage_location, organization: organization)
-      create_list(:purchase, 2, :with_items, item: create(:item, organization: organization), item_quantity: 5, storage_location: storage_location, organization: organization)
-      create_list(:adjustment, 2, :with_items, item: create(:item, organization: organization), item_quantity: 5, storage_location: storage_location, organization: organization)
-      create_list(:transfer, 2, :with_items, item_quantity: 5, item: other_item, from: other_storage_location, to: storage_location, organization: organization)
-    end
-
-    it "returns a collection with the fields name, item_id, quantity" do
-      expect(subject.first).to be_respond_to(:name)
-      expect(subject.first).to be_respond_to(:quantity)
-      expect(subject.first).to be_respond_to(:item_id)
-    end
-
-    it "includes donations, purchases, adjustments, transfers among sources" do
-      expect(subject.to_a.size).to eq(4)
-    end
-
-    it "does not count negative adjustments towards in-flow" do
-      shared_item = create(:item, organization: organization)
-      create(:donation, :with_items, item: shared_item, item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: shared_item, item_quantity: -10, storage_location: storage_location, organization: organization)
-      expect(subject.to_a.size).to eq(5)
-    end
-
-    it "does not count transfers going in the negative direction" do
-      shared_item = create(:item, organization: organization)
-      create(:donation, :with_items, item: shared_item, item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:transfer, :with_items, item_quantity: 10, item: shared_item, from: storage_location, to: other_storage_location, organization: organization)
-      expect(subject.to_a.size).to eq(5)
-    end
-  end
-end
diff --git a/spec/queries/items_in_total_query_spec.rb b/spec/queries/items_in_total_query_spec.rb
deleted file mode 100644
index 00c18b9bf7..0000000000
--- a/spec/queries/items_in_total_query_spec.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Spec for /app/queries/items_in_total_query.rb
-
-RSpec.describe ItemsInTotalQuery do
-  let(:organization) { create(:organization) }
-  let!(:storage_location) { create(:storage_location, organization: organization) }
-  let(:other_item) { create(:item, organization: organization) }
-  let!(:other_storage_location) { create(:storage_location, :with_items, item: other_item, item_quantity: 10, organization: organization) }
-  let!(:shared_item) { create(:item, organization: organization) }
-
-  subject { ItemsInTotalQuery.new(storage_location: storage_location, organization: organization).call }
-
-  describe "items_in_total_query" do
-    before do
-      create(:donation, :with_items, item: create(:item, organization: organization), item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:purchase, :with_items, item: create(:item, organization: organization), item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: create(:item, organization: organization), item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:transfer, :with_items, item_quantity: 10, item: other_item, from: other_storage_location, to: storage_location, organization: organization)
-    end
-
-    it "returns a sum total of all in-flows" do
-      expect(subject).to eq(40)
-    end
-
-    it "counts shared items together" do
-      create(:donation, :with_items, item: shared_item, item_quantity: 50, storage_location: storage_location, organization: organization)
-      create(:purchase, :with_items, item: shared_item, item_quantity: 100, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: shared_item, item_quantity: 50, storage_location: storage_location, organization: organization)
-      create(:donation, :with_items, item: shared_item, item_quantity: 100, storage_location: storage_location, organization: organization)
-      create(:purchase, :with_items, item: shared_item, item_quantity: 50, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: shared_item, item_quantity: 100, storage_location: storage_location, organization: organization)
-      expect(subject).to eq(490)
-    end
-
-    it "does not count negative adjustments towards in-flow" do
-      create(:donation, :with_items, item: shared_item, item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: shared_item, item_quantity: -10, storage_location: storage_location, organization: organization)
-      expect(subject).to eq(50)
-    end
-
-    it "does not count transfers going in the negative direction" do
-      create(:donation, :with_items, item: shared_item, item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:transfer, :with_items, item_quantity: 10, item: shared_item, from: storage_location, to: other_storage_location, organization: organization)
-      expect(subject).to eq(50)
-    end
-
-    it "does not count donations, purchases, adjustments to other storage locations" do
-      create(:donation, :with_items, item: create(:item, organization: organization), item_quantity: 100, storage_location: other_storage_location, organization: organization)
-      create(:purchase, :with_items, item: create(:item, organization: organization), item_quantity: 10, storage_location: other_storage_location, organization: organization)
-      create(:adjustment, :with_items, item: create(:item, organization: organization), item_quantity: 10, storage_location: other_storage_location, organization: organization)
-      expect(subject).to eq(40)
-    end
-  end
-end
diff --git a/spec/queries/items_out_query_spec.rb b/spec/queries/items_out_query_spec.rb
deleted file mode 100644
index 9bbe735ac7..0000000000
--- a/spec/queries/items_out_query_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Spec for /app/queries/items_out_query.rb
-
-RSpec.describe ItemsOutQuery do
-  let(:organization) { create(:organization) }
-  let!(:storage_location) { create(:storage_location, organization: organization) }
-  subject { ItemsOutQuery.new(storage_location: storage_location, organization: organization).call }
-
-  describe "items_out_query" do
-    before do
-      items = create_list(:item, 3, organization: organization)
-      TestInventory.create_inventory(storage_location.organization, {
-        storage_location.id => items.to_h { |i| [i.id, 10] }
-      })
-      other_storage_location = create(:storage_location, organization: organization)
-      create(:transfer, :with_items, item_quantity: 8, item: items[0], to: other_storage_location, from: storage_location, organization: organization)
-      create(:distribution, :with_items, item: items[1], item_quantity: 9, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: items[2], item_quantity: -10, storage_location: storage_location, organization: organization)
-    end
-
-    it "returns a collection with the fields name, item_id, quantity" do
-      expect(subject.first).to be_respond_to(:name)
-      expect(subject.first).to be_respond_to(:quantity)
-      expect(subject.first).to be_respond_to(:item_id)
-    end
-
-    it "includes distributions, adjustments, transfers among sources" do
-      expect(subject.to_a.size).to eq(3)
-    end
-  end
-end
diff --git a/spec/queries/items_out_total_query_spec.rb b/spec/queries/items_out_total_query_spec.rb
deleted file mode 100644
index deab96d3ed..0000000000
--- a/spec/queries/items_out_total_query_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Spec for /app/queries/items_out_total_query.rb
-
-RSpec.describe ItemsOutTotalQuery do
-  let(:organization) { create(:organization) }
-  let!(:storage_location) { create(:storage_location, organization: organization) }
-  subject { ItemsOutTotalQuery.new(storage_location: storage_location, organization: organization).call }
-
-  describe "items_out_total_query" do
-    before do
-      items = create_list(:item, 3, organization: organization)
-      TestInventory.create_inventory(storage_location.organization, {
-        storage_location.id => items.to_h { |i| [i.id, 10] }
-      })
-      other_storage_location = create(:storage_location, organization: organization)
-      create(:transfer, :with_items, item_quantity: 10, item: items[0], to: other_storage_location, from: storage_location, organization: organization)
-      create(:distribution, :with_items, item: items[1], item_quantity: 10, storage_location: storage_location, organization: organization)
-      create(:adjustment, :with_items, item: items[2], item_quantity: -10, storage_location: storage_location, organization: organization)
-    end
-
-    it "returns a sum total of all out-flows" do
-      expect(subject).to eq(30)
-    end
-  end
-end
diff --git a/spec/requests/storage_locations_requests_spec.rb b/spec/requests/storage_locations_requests_spec.rb
index 12a7eb42ec..43770b38cc 100644
--- a/spec/requests/storage_locations_requests_spec.rb
+++ b/spec/requests/storage_locations_requests_spec.rb
@@ -335,6 +335,19 @@
       context "html" do
         let(:response_format) { 'html' }
 
+        it "selects the Inventory tab, or the Inventory Flow tab when filtering by date range" do
+          get storage_location_path(storage_location, format: response_format)
+          tabs = Nokogiri::HTML(response.body)
+          expect(tabs.at_css("#custom-tabs-inventory-tab")["aria-selected"]).to eq("true")
+          expect(tabs.at_css("#custom-tabs-inventory-flow-tab")["aria-selected"]).to eq("false")
+
+          get storage_location_path(storage_location, format: response_format,
+            filters: {date_range: "January 1, 2026 - January 31, 2026"})
+          tabs = Nokogiri::HTML(response.body)
+          expect(tabs.at_css("#custom-tabs-inventory-tab")["aria-selected"]).to eq("false")
+          expect(tabs.at_css("#custom-tabs-inventory-flow-tab")["aria-selected"]).to eq("true")
+        end
+
         it "should return a correct response" do
           get storage_location_path(storage_location, format: response_format)
           expect(response).to be_successful
diff --git a/spec/system/storage_location_system_spec.rb b/spec/system/storage_location_system_spec.rb
index aaff61b639..0d0add1f03 100644
--- a/spec/system/storage_location_system_spec.rb
+++ b/spec/system/storage_location_system_spec.rb
@@ -99,13 +99,6 @@
 
       click_on "View", match: :first
 
-      find("#custom-tabs-inventory-in-tab").click
-
-      within "#custom-tabs-inventory-in" do
-        expect(page).to have_content("Needle")
-        expect(page).to have_content(100)
-      end
-
       find("#custom-tabs-inventory-tab").click
 
       within "#custom-tabs-inventory" do
@@ -191,24 +184,111 @@
   end
 
   context "when viewing an existing storage location" do
-    let(:item) { create(:item, name: "AAA Diapers") }
-    let!(:storage_location) { create(:storage_location, :with_items, item: item, name: "here") }
-    let!(:adjustment) { create(:adjustment, :with_items, storage_location: storage_location) }
+    let(:items) { create_list(:item, 2) }
+    let!(:storage_location) { create(:storage_location, name: "here") }
+    let(:result) do
+      [
+        {
+          item_id: items[0].id,
+          item_name: items[0].name,
+          quantity_start: 0,
+          quantity_in: 10,
+          quantity_out: 5,
+          quantity_adjustment: 0,
+          change: 5,
+          quantity_end: 5,
+          total_quantity_in: 13,
+          total_quantity_out: 7,
+          total_change: 9
+        },
+        {
+          # The adjustment (+3) shows in the adjustment column, not as in.
+          item_id: items[1].id,
+          item_name: items[1].name,
+          quantity_start: 0,
+          quantity_in: 3,
+          quantity_out: 2,
+          quantity_adjustment: 3,
+          change: 4,
+          quantity_end: 4,
+          total_quantity_in: 13,
+          total_quantity_out: 7,
+          total_change: 9
+        }
+      ].map(&:with_indifferent_access)
+    end
     subject { storage_location_path(storage_location.id) }
 
-    it "Items in (adjustments)" do
-      visit subject
-      find("#custom-tabs-inventory-in-tab").click
-
-      expect(page.find("#custom-tabs-inventory-in", visible: true)).to have_content "100"
-    end
+    context "Inventory Flow Tab" do
+      before do
+        create(:donation, :with_items, item: items[0], item_quantity: 10, storage_location: storage_location)
+        distribution = create(:distribution, :with_items, item: items[0], item_quantity: 5, storage_location: storage_location)
+        DistributionEvent.publish(distribution)
+        create(:donation, :with_items, item: items[1], item_quantity: 3, storage_location: storage_location)
+        adjustment = create(:adjustment, :with_items, item: items[1], item_quantity: 3, storage_location: storage_location)
+        AdjustmentEvent.publish(adjustment)
+        transfer = create(:transfer, :with_items, item: items[1], item_quantity: 2, from: storage_location, to: create(:storage_location))
+        TransferEvent.publish(transfer)
+        visit subject
+        find("#custom-tabs-inventory-flow-tab").click
+      end
 
-    it "Items out (distributions)" do
-      create(:distribution, :with_items, storage_location: storage_location)
-      visit subject
-      find("#custom-tabs-inventory-out-tab").click
+      it "shows the inventory flow for the storage location" do
+        within("#custom-tabs-inventory-flow table tbody") do
+          result.each do |item|
+            row = find(:css, "tr[id='#{item[:item_id]}']")
+            change_column_css = item[:change].negative? ? "td.modal-body-warning-text" : "td"
+            expect(row).to have_link(item[:name], href: item_path(item[:item_id]))
+            expect(row).to have_css("td", text: item[:quantity_in])
+            expect(row).to have_css("td", text: item[:quantity_out])
+            expect(row).to have_css(change_column_css, text: item[:change])
+          end
+        end
+        within("#custom-tabs-inventory-flow table tfoot") do
+          expect(page).to have_css("td", text: "Total")
+          expect(page).to have_css("td", text: result.first[:total_quantity_in])
+          expect(page).to have_css("td", text: result.first[:total_quantity_out])
+          expect(page).to have_css("td", text: result.first[:total_change])
+        end
+      end
 
-      expect(page.find("#custom-tabs-inventory-out", visible: true)).to have_content "100"
+      context "date range filter" do
+        let!(:start_date) { 2.days.ago }
+        let!(:end_date) { 1.day.ago }
+        let!(:item) { create(:item, name: "Filtered Item") }
+        let(:result) do
+          [
+            {
+              item_id: item.id,
+              item_name: item.name,
+              quantity_in: 10,
+              quantity_out: 0,
+              change: 10,
+              total_quantity_in: 10,
+              total_quantity_out: 0,
+              total_change: 10
+            }
+          ].map(&:with_indifferent_access)
+        end
+        before do
+          create(:donation, :with_items, item: item, item_quantity: 10, storage_location: storage_location)
+          Event.last.update(event_time: start_date)
+          fill_in "filters[date_range]", with: "#{start_date.strftime("%B %d, %Y")} - #{end_date.strftime("%B %d, %Y")}"
+          click_button "Filter"
+          find("#custom-tabs-inventory-flow-tab").click
+        end
+
+        it "filters the inventory flow by date range" do
+          within("#custom-tabs-inventory-flow table tbody") do
+            expect(page).to have_css("tr", count: 1)
+            row = find(:css, "tr[id='#{result.first[:item_id]}']")
+            expect(row).to have_link(result.first[:name], href: item_path(result.first[:item_id]))
+            expect(row).to have_css("td", text: result.first[:quantity_in])
+            expect(row).to have_css("td", text: result.first[:quantity_out])
+            expect(row).to have_css("td", text: result.first[:change])
+          end
+        end
+      end
     end
   end
 end