fix(projects): refresh weekly project labels and clear stale list filters

Author: Rocket-Quack

time_tracking/time_tracking/doctype/time_tracking_profile/test_time_tracking_profile.py

@@ -120,3 +120,23 @@ def test_employee_can_load_profile_ui_settings_without_settings_read_access(self
 
 		self.assertIn("track_target_adjustments", settings)
 		self.assertIn("require_project_assignment", settings)
+
+	def test_duplicate_project_assignment_error_uses_project_label(self):
+		user = self._make_user("duplicate-project")
+		parent_label = f"Parent-{frappe.generate_hash(length=6)}"
+		parent = self._make_project(parent_label)
+		project = frappe.get_doc(
+			{
+				"doctype": "Time Tracking Project",
+				"project_name": f"Child-{frappe.generate_hash(length=6)}",
+				"parent_time_tracking_project": parent,
+			}
+		).insert(ignore_permissions=True)
+
+		frappe.set_user("Administrator")
+		with self.assertRaises(frappe.ValidationError) as exc:
+			self._make_profile(user, [project.name, project.name])
+
+		self.assertIn(parent_label, str(exc.exception))
+		self.assertIn(project.project_name, str(exc.exception))
+		self.assertNotIn(project.name, str(exc.exception))

time_tracking/time_tracking/doctype/time_tracking_profile/time_tracking_profile.py

@@ -4,6 +4,7 @@
 from frappe.utils import cint, flt, now_datetime
 
 from time_tracking.time_tracking.doctype.time_tracking_project.time_tracking_project import (
+	build_project_path_labels,
 	expand_project_assignments,
 )
 from time_tracking.time_tracking.vacation_utils import get_default_workdays_per_week
@@ -210,7 +211,10 @@ def _validate_project_assignment_duplicates(self):
 				seen.add(project)
 
 		if duplicates:
-			project_list = ", ".join(sorted(duplicates))
+			project_labels = build_project_path_labels(list(duplicates))
+			project_list = ", ".join(
+				sorted(project_labels.get(project, project) for project in duplicates)
+			)
 			frappe.throw(_("Project {0} is already assigned to this profile.").format(project_list))
 
 	def _validate_project_assignment_permissions(self):

time_tracking/time_tracking/doctype/time_tracking_project/time_tracking_project_list.js

@@ -25,6 +25,39 @@ frappe.listview_settings["Time Tracking Project"] = {
 			});
 		};
 
+		const removeInvalidParentFilters = () => {
+			const area = filterArea();
+			if (!area || !area.filters) {
+				return false;
+			}
+
+			let changed = false;
+			const filters = area.filters.slice();
+			filters.forEach((filter) => {
+				const filterField = filter.fieldname || (filter.df && filter.df.fieldname) || "";
+				const rawValue =
+					filter.value !== undefined
+						? filter.value
+						: filter.get_value
+							? filter.get_value()
+							: filter[3];
+				if (filterField !== "parent_time_tracking_project") {
+					return;
+				}
+				if (rawValue !== "" && rawValue !== null && rawValue !== "Time Tracking Project") {
+					return;
+				}
+				changed = true;
+				if (area.remove_filter) {
+					area.remove_filter(filter);
+				} else if (filter.remove) {
+					filter.remove();
+				}
+			});
+
+			return changed;
+		};
+
 		const addFilter = (fieldname, value) => {
 			const area = filterArea();
 			if (!area) {
@@ -66,6 +99,10 @@ frappe.listview_settings["Time Tracking Project"] = {
 			applyFilter("not_bookable", 1);
 		});
 		listview.page.add_inner_button(__("Clear Filters"), clearFilters);
+
+		if (removeInvalidParentFilters()) {
+			listview.refresh();
+		}
 	},
 	get_indicator(doc) {
 		const status = (doc.project_status || "Active").trim();

time_tracking/time_tracking/page/weekly_booking/test_weekly_booking.py

@@ -241,3 +241,31 @@ def test_group_project_is_available_and_bookable_when_setting_enabled(self):
 
 		result = get_weekly_booking(week_start_date="2026-04-13")
 		self.assertTrue(any(row["project"] == group for row in result["rows"]))
+
+	def test_existing_unassigned_booking_includes_project_label(self):
+		user = self._make_user("legacy-project")
+		assigned_project = self._make_project(f"Assigned-{frappe.generate_hash(length=6)}")
+		legacy_project = self._make_project(f"Legacy-{frappe.generate_hash(length=6)}")
+		legacy_project_label = frappe.db.get_value(
+			"Time Tracking Project", legacy_project, "project_name"
+		)
+		self._make_profile(user, assigned_project)
+
+		frappe.set_user(user)
+		frappe.get_doc(
+			{
+				"doctype": "Time Booking",
+				"time_tracking_profile": user,
+				"date": "2026-04-13",
+				"project": legacy_project,
+				"duration_minutes": 60,
+				"notes": "Imported legacy booking",
+			}
+		).insert(ignore_permissions=True)
+
+		assigned_projects = get_assigned_projects(user=user)
+		self.assertNotIn(legacy_project, {project.name for project in assigned_projects})
+
+		result = get_weekly_booking(week_start_date="2026-04-13")
+		self.assertTrue(any(row["project"] == legacy_project for row in result["rows"]))
+		self.assertEqual(result["project_labels"][legacy_project], legacy_project_label)

time_tracking/time_tracking/page/weekly_booking/weekly_booking.js

@@ -337,6 +337,7 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
 	const state = {
 		projects_loaded: false,
 		projects: [],
+		project_labels: {},
 		increment_minutes: 15,
 		day_label_format: "DD.MM.YYYY",
 		weekly_target_hours: null,
@@ -606,12 +607,20 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
 
 		if (selected && !selectedFound) {
 			const value = escape(selected);
-			options.push(`<option value="${value}" selected>${value}</option>`);
+			const fallbackLabel = escape(state.project_labels[selected] || selected);
+			options.push(`<option value="${value}" selected>${fallbackLabel}</option>`);
 		}
 
 		return options.join("");
 	}
 
+	function mergeProjectLabels(labels) {
+		if (!labels || typeof labels !== "object") {
+			return;
+		}
+		state.project_labels = Object.assign({}, state.project_labels, labels);
+	}
+
 	function normalizeBillType(value) {
 		return value === BILL_TYPE_UNBILLABLE ? BILL_TYPE_UNBILLABLE : BILL_TYPE_BILLABLE;
 	}
@@ -1090,6 +1099,14 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
 				}
 				const projects = Array.isArray(message) ? message : message.projects || [];
 				state.projects = projects;
+				mergeProjectLabels(
+					projects.reduce((acc, project) => {
+						if (project && project.name) {
+							acc[project.name] = project.path_label || project.project_name || project.name;
+						}
+						return acc;
+					}, {})
+				);
 				state.projects_loaded = true;
 				refreshProjectSelectOptions();
 				$addRowButton.prop("disabled", false);
@@ -1109,7 +1126,7 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
 		}
 		state.projects_loaded = false;
 		if (document.body && document.body.dataset.route === "weekly-booking") {
-			loadProjects({ force_reload: true });
+			loadWeek();
 		}
 	}
 
@@ -1234,6 +1251,8 @@ frappe.pages["weekly-booking"].on_page_load = function (wrapper) {
 				updateDayHeaders();
 
 				const rows = message.rows || [];
+				state.project_labels = {};
+				mergeProjectLabels(message.project_labels || {});
 				const suggestions = buildSuggestionRows(message.previous_week_rows || [], rows);
 				state.loaded_week_total_minutes = calculateWeekMinutes(rows);
 				state.saved_row_counts = buildSavedRowCounts(rows);

time_tracking/time_tracking/page/weekly_booking/weekly_booking.py

@@ -178,7 +178,7 @@ def _get_assigned_projects(user, profile_name=None):
 		fields=["name", "project_name"],
 	)
 	project_map = {project.name: project for project in projects}
-	path_labels = build_project_path_labels(list(project_map.keys()))
+	path_labels = _get_project_labels(list(project_map.keys()))
 	ordered = []
 	for name in project_names:
 		if name not in project_map:
@@ -189,6 +189,25 @@ def _get_assigned_projects(user, profile_name=None):
 	return ordered
 
 
+def _get_project_labels(project_names):
+	project_names = [name for name in project_names if name]
+	if not project_names:
+		return {}
+
+	projects = frappe.get_all(
+		"Time Tracking Project",
+		filters={"name": ["in", project_names]},
+		fields=["name", "project_name"],
+	)
+	project_map = {project.name: project for project in projects}
+	path_labels = build_project_path_labels(list(project_map.keys()))
+
+	return {
+		name: path_labels.get(name, project.project_name or name)
+		for name, project in project_map.items()
+	}
+
+
 def _get_assigned_project_names(user):
 	return {project.name for project in _get_assigned_projects(user)}
 
@@ -347,6 +366,12 @@ def get_weekly_booking(user=None, week_start_date=None):
 	)
 
 	response["vacation"] = _get_vacation_summary(profile_name, week_start_date)
+	project_names = {
+		row.get("project")
+		for row in [*response["rows"], *response["previous_week_rows"]]
+		if row.get("project")
+	}
+	response["project_labels"] = _get_project_labels(list(project_names))
 	return response