diff --git a/api/docs/swagger.yaml b/api/docs/swagger.yaml
index 8567c28cf..a50bfad9c 100644
--- a/api/docs/swagger.yaml
+++ b/api/docs/swagger.yaml
@@ -901,12 +901,12 @@ paths:
       security:
       - api_key: []
       - user_id: []
-  /project:
-    get:
-      summary: Metadata about all projects
+  /project:
+    get:
+      summary: Metadata about all projects (with Maitrise entries)
       tags:
       - "Project"
-      description: 'Returns the metadata about projects in the system, but not members of the projects.'
+      description: 'Returns the metadata about projects in the system, including Maitrise (type, bureau, email) entries for each project.'
       produces:
       - "application/json"
       operationId: "GetProjectList"
@@ -917,8 +917,8 @@ paths:
           description: "successful operation"
           schema:
             type: "array"
-            items:
-              $ref: "#/definitions/Project"
+            items:
+              $ref: "#/definitions/Project"
       security:
       - api_key: []
       - user_id: []
@@ -1063,7 +1063,7 @@ paths:
       security:
       - api_key: []
       - user_id: []
-definitions:
+definitions:
   Audit:
     type: "object"
     properties:
@@ -1617,27 +1617,43 @@ definitions:
       Disabled:
         type: boolean
         format: "User has been disabled"
-  Project:
-    type: "object"
-    properties:
-      ProjectID:
-        type: "integer"
-        format: "keyValue"
-      ProjectName:
-        type: "string"
-        format: "Freeform text"
-      ProjectSponsor:
-        type: "string"
-        format: "Freeform text"
-      ProjectStartDate:
-        type: "string"
-        format: "Datestamp"
-      ProjectEndDate:
-        type: "string"
-        format: "Datestamp"
-      ProjectActualEndDate:
-        type: "string"
-        format: "Datestamp"
+  Project:
+    type: "object"
+    properties:
+      ProjectID:
+        type: "integer"
+        format: "keyValue"
+      ProjectName:
+        type: "string"
+        format: "Freeform text"
+      ProjectSponsor:
+        type: "string"
+        format: "Freeform text"
+      ProjectStartDate:
+        type: "string"
+        format: "Datestamp"
+      ProjectEndDate:
+        type: "string"
+        format: "Datestamp"
+      ProjectActualEndDate:
+        type: "string"
+        format: "Datestamp"
+      Maitrise:
+        type: "array"
+        items:
+          $ref: "#/definitions/ProjectMaitrise"
+  ProjectMaitrise:
+    type: "object"
+    properties:
+      MaitriseName:
+        type: "string"
+        format: "Freeform text"
+      BureauName:
+        type: "string"
+        format: "Freeform text"
+      BureauEmail:
+        type: "string"
+        format: "EmailAddress"
   PowerPort:
     type: "object"
     properties:
diff --git a/api/v1/getRoutes.php b/api/v1/getRoutes.php
index 5d0b22043..30be21e8c 100644
--- a/api/v1/getRoutes.php
+++ b/api/v1/getRoutes.php
@@ -706,11 +706,47 @@
 //
 
 $app->get( '/project', function(Request $request, Response $response) {
-	$r['error']=false;
-	$r['errorcode']=200;
-	$r['project']=Projects::getProjectList();
+    $r['error']=false;
+    $r['errorcode']=200;
+
+    $list = Projects::getProjectList();
+
+    // Fetch Maitrise rows for each project
+    global $dbh;
+    $st = null;
+    try{
+        $st = $dbh->prepare("SELECT mt.MaitriseName, pm.BureauName, pm.BureauEmail
+                              FROM fac_ProjectMaitrise pm
+                              LEFT JOIN fac_MaitriseType mt ON mt.MaitriseTypeID = pm.MaitriseTypeID
+                              WHERE pm.ProjectID = :pid
+                              ORDER BY pm.ProjectMaitriseID ASC");
+    }catch(Exception $e){
+        $st = null; // If tables don't exist, just omit maitrise info
+    }
+
+    $projects = array();
+    foreach($list as $p){
+        $tmp = array();
+        foreach($p as $prop=>$val){
+            $tmp[$prop] = $val;
+        }
+        // Attach maitrise info if available
+        $tmp['Maitrise'] = array();
+        if($st){
+            try{
+                $st->execute(array(':pid'=>$p->ProjectID));
+                $tmp['Maitrise'] = $st->fetchAll(PDO::FETCH_ASSOC);
+            }catch(Exception $e){
+                // ignore errors and leave Maitrise empty
+                $tmp['Maitrise'] = array();
+            }
+        }
+        $projects[] = $tmp;
+    }
+
+    $r['project'] = $projects;
 
-	return $response->withJson( $r, $r['errorcode'] );
+    return $response->withJson( $r, $r['errorcode'] );
 });
 
 //
diff --git a/classes/MaitriseType.class.php b/classes/MaitriseType.class.php
new file mode 100644
index 000000000..e929c4dc3
--- /dev/null
+++ b/classes/MaitriseType.class.php
@@ -0,0 +1,36 @@
+<?php
+/*
+  OpenDCIM - Feature Project Maitrise Link
+  Author: Alexandre Oliveira
+*/
+
+class MaitriseType {
+  var $MaitriseTypeID;
+  var $MaitriseName;
+
+  static function GetAll(){
+    global $dbh;
+    $stmt=$dbh->prepare("SELECT * FROM fac_MaitriseType ORDER BY MaitriseName ASC;");
+    $stmt->execute();
+    return $stmt->fetchAll(PDO::FETCH_CLASS,"MaitriseType");
+  }
+
+  static function Insert($name){
+    global $dbh;
+    $stmt=$dbh->prepare("INSERT INTO fac_MaitriseType SET MaitriseName=:name;");
+    return $stmt->execute(array(":name"=>$name));
+  }
+
+  static function Delete($id){
+    global $dbh;
+    $stmt=$dbh->prepare("DELETE FROM fac_MaitriseType WHERE MaitriseTypeID=:id;");
+    return $stmt->execute(array(":id"=>$id));
+  }
+
+  static function Update($id,$name){
+    global $dbh;
+    $stmt=$dbh->prepare("UPDATE fac_MaitriseType SET MaitriseName=:name WHERE MaitriseTypeID=:id;");
+    return $stmt->execute(array(":id"=>intval($id), ":name"=>$name));
+  }
+}
+?>
diff --git a/create.sql b/create.sql
index 3144611dc..5ddc1c6a2 100644
--- a/create.sql
+++ b/create.sql
@@ -1111,6 +1111,32 @@ CREATE TABLE fac_ProjectMembership (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
+--
+-- Maitrise types and project linkage
+--
+
+DROP TABLE IF EXISTS fac_MaitriseType;
+CREATE TABLE fac_MaitriseType (
+  MaitriseTypeID INT AUTO_INCREMENT PRIMARY KEY,
+  MaitriseName VARCHAR(100) UNIQUE NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO fac_MaitriseType (MaitriseName)
+VALUES
+('CUSTOMER'),
+('PROD ES');
+
+DROP TABLE IF EXISTS fac_ProjectMaitrise;
+CREATE TABLE fac_ProjectMaitrise (
+  ProjectMaitriseID INT AUTO_INCREMENT PRIMARY KEY,
+  ProjectID INT NOT NULL,
+  MaitriseTypeID INT NOT NULL,
+  BureauName VARCHAR(100) NOT NULL,
+  BureauEmail VARCHAR(255) NULL DEFAULT NULL,
+  KEY (ProjectID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
 --
 -- Tables for tracking how things leave
 --
diff --git a/css/inventory.php b/css/inventory.php
index 0b4dd74c7..87bed2deb 100644
--- a/css/inventory.php
+++ b/css/inventory.php
@@ -520,6 +520,16 @@
 		padding: 10px;
 		margin-bottom: 8px;
 }
+
+/* Maitrise Types modal spacing */
+#maitrisetypesmodal { padding: 10px; }
+#maitrisetypesmodal table { border-collapse: separate; border-spacing: 0 8px; }
+#maitrisetypesmodal th, #maitrisetypesmodal td { padding: 6px 10px; vertical-align: middle; }
+#maitrisetypesmodal input[type="text"],
+#maitrisetypesmodal input[type="email"],
+#maitrisetypesmodal select { padding: 6px 8px; margin: 4px 6px 4px 0; }
+#maitrisetypesmodal button { margin: 4px 6px; }
+#maitrisetypesmodal .note { margin-top: 10px; display: block; }
 #infopanel fieldset button, #infopanel fieldset input[type=submit], #infopanel fieldset input[type=button],.reports fieldset button, .reports fieldset input[type=submit], .reports fieldset input[type=button] {width: 100%;}
 #infopanel legend, .device legend, .reports legend {border: 1px <?php echo $config->ParameterArray['HeaderColor']; ?> solid;background-color: white;}
 div.cabinet {
@@ -1131,6 +1141,11 @@
 #pandn.table .custom-combobox a {margin: 0; vertical-align: top; border-left: 0px; border-right: 2px; position: absolute;} 
 div#pandn.table div[id^="ppn"] { min-width: 200px; }
 
+/* Project Manager: align combobox toggle with input */
+#projectid + span.custom-combobox { position: relative; display: inline-block; width: 100%; vertical-align: middle; }
+#projectid + span.custom-combobox input { width: calc(100% - 24px) !important; }
+#projectid + span.custom-combobox a.custom-combobox-toggle { position: absolute; right: 0; top: 0; bottom: 0; width: 24px; padding: 0; }
+
 #olog > div:first-child { border-bottom: 2px solid black; }
 #olog > div > div:first-child { width: 100px; padding-right: 5px; white-space: nowrap; }
 #olog > div:first-child > div:first-child { border-right: 0 none; }
diff --git a/db-23.04-to-25.01.sql b/db-23.04-to-25.01.sql
index 6f1c63bcc..60a81bedd 100644
--- a/db-23.04-to-25.01.sql
+++ b/db-23.04-to-25.01.sql
@@ -111,4 +111,29 @@ ALTER TABLE fac_TemplatePowerPorts ADD COLUMN ConnectorID int(11) DEFAULT NULL A
 ALTER TABLE fac_TemplatePowerPorts ADD COLUMN PhaseID int(11) DEFAULT NULL AFTER ConnectorID;
 ALTER TABLE fac_TemplatePowerPorts ADD COLUMN VoltageID int(11) DEFAULT NULL AFTER PhaseID;
 
+--
+-- Maitrise types and project linkage
+--
+
+DROP TABLE IF EXISTS fac_MaitriseType;
+CREATE TABLE fac_MaitriseType (
+  MaitriseTypeID INT AUTO_INCREMENT PRIMARY KEY,
+  MaitriseName VARCHAR(100) UNIQUE NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+INSERT INTO fac_MaitriseType (MaitriseName)
+VALUES
+('CUSTOMER'),
+('PROD ES');
+
+DROP TABLE IF EXISTS fac_ProjectMaitrise;
+CREATE TABLE fac_ProjectMaitrise (
+  ProjectMaitriseID INT AUTO_INCREMENT PRIMARY KEY,
+  ProjectID INT NOT NULL,
+  MaitriseTypeID INT NOT NULL,
+  BureauName VARCHAR(100) NOT NULL,
+  BureauEmail VARCHAR(255) NULL DEFAULT NULL,
+  KEY (ProjectID)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 UPDATE fac_Config set Value="25.01" WHERE Parameter="Version";
diff --git a/project_mgr.php b/project_mgr.php
index 3257d211f..0b086662d 100644
--- a/project_mgr.php
+++ b/project_mgr.php
@@ -1,6 +1,7 @@
 <?php
 	require_once('db.inc.php');
 	require_once('facilities.inc.php');
+	require_once('classes/MaitriseType.class.php');
 
 	$subheader=__("Project Detail");
 
@@ -24,6 +25,35 @@
 
 	$project = new Projects();
 
+	// Collect non-blocking warnings (e.g., invalid optional emails)
+	$maitriseEmailWarnings = array();
+
+	// Handle Maitrise Type management actions (admin only)
+	if(isset($_POST['mt_action']) && $person->ContactAdmin){
+		if($_POST['mt_action']==='AddType' && isset($_POST['newmaitrise'])){
+			$name=trim($_POST['newmaitrise']);
+			if($name!==''){
+				MaitriseType::Insert($name);
+			}
+		}
+		if($_POST['mt_action']==='DeleteType' && isset($_POST['deletetypeid'])){
+			$id=intval($_POST['deletetypeid']);
+			if($id>0){
+				MaitriseType::Delete($id);
+			}
+		}
+		if($_POST['mt_action']==='UpdateType' && isset($_POST['updatetypeid'])){
+			$id=intval($_POST['updatetypeid']);
+			$name=isset($_POST['updatename'])?trim($_POST['updatename']):'';
+			if($id>0 && $name!==''){
+				MaitriseType::Update($id,$name);
+			}
+		}
+		// Refresh to avoid resubmission
+		header('Location: '.redirect('project_mgr.php'.(isset($_REQUEST['projectid'])?'?projectid='.(int)$_REQUEST['projectid']:'')));
+		exit;
+	}
+
 	if(isset($_REQUEST['projectid'])&&($_REQUEST['projectid']>0)){
 		$project->ProjectID=(isset($_POST['projectid']) ? $_POST['projectid'] : $_GET['projectid']);
 		$project = Projects::getProject( $project->ProjectID );
@@ -40,11 +70,16 @@
 		if($project->ProjectName!=''){
 			if($_POST['action']=='Create'){
 				$project->createProject();
-				
+				// Save Maitrise rows for the new project
+				if($project->ProjectID>0){
+					saveProjectMaitriseRows($project->ProjectID);
+				}
 				header('Location: '.redirect("project_mgr.php?projectid=$project->ProjectID"));
 				exit;
 			}else{
 				$project->updateProject();
+				// Save Maitrise rows for existing project
+				saveProjectMaitriseRows($project->ProjectID);
 			}
 		}
 		// Refresh object
@@ -53,7 +88,92 @@
 
 	$projectList=Projects::getProjectList();
 
+	// Helper to check if a table exists
+	function tableExists($name){
+		global $dbh;
+		try{
+			$st=$dbh->prepare("SHOW TABLES LIKE :t");
+			$st->execute(array(":t"=>$name));
+			return ($st->rowCount()>0);
+		}catch(Exception $e){ return false; }
+	}
+
+	// Fetch Maitrise types and existing rows for this project
+	$maitriseTypes = array();
+	if(function_exists('tableExists') && tableExists('fac_MaitriseType')){
+		$maitriseTypes = MaitriseType::GetAll();
+	}
+	$projectMaitriseRows = array();
+	if(isset($project->ProjectID) && $project->ProjectID>0 && tableExists('fac_ProjectMaitrise')){
+		$st=$dbh->prepare("SELECT pm.ProjectMaitriseID, pm.MaitriseTypeID, pm.BureauName, pm.BureauEmail FROM fac_ProjectMaitrise pm WHERE pm.ProjectID=:pid ORDER BY pm.ProjectMaitriseID ASC");
+		$st->execute(array(":pid"=>$project->ProjectID));
+		$projectMaitriseRows=$st->fetchAll(PDO::FETCH_ASSOC);
+	}
+
+	// Helper function to save Maitrise rows
+	function saveProjectMaitriseRows($projectID){
+		global $dbh;
+		global $maitriseEmailWarnings;
+		// Ensure required table exists; if not, skip gracefully
+		try{
+			$chk=$dbh->query("SHOW TABLES LIKE 'fac_ProjectMaitrise'");
+			if(!$chk || $chk->rowCount()==0){
+				return; // table not present yet
+			}
+		}catch(Exception $ex){
+			return;
+		}
+		$types = isset($_POST['maitrise_type']) && is_array($_POST['maitrise_type']) ? $_POST['maitrise_type'] : array();
+		$names = isset($_POST['maitrise_bureau']) && is_array($_POST['maitrise_bureau']) ? $_POST['maitrise_bureau'] : array();
+		$emails = isset($_POST['maitrise_email']) && is_array($_POST['maitrise_email']) ? $_POST['maitrise_email'] : array();
+		// Clear existing
+		$del=$dbh->prepare("DELETE FROM fac_ProjectMaitrise WHERE ProjectID=:pid");
+		$del->execute(array(":pid"=>$projectID));
+		// Insert new
+		$ins=$dbh->prepare("INSERT INTO fac_ProjectMaitrise SET ProjectID=:pid, MaitriseTypeID=:mtid, BureauName=:bname, BureauEmail=:bemail");
+		for($i=0;$i<count($types);$i++){
+			$mtid=intval($types[$i]);
+			$bname=isset($names[$i])?trim($names[$i]):'';
+			$bemail=isset($emails[$i])?trim($emails[$i]):'';
+			// Allow empty email: save NULL when not provided
+			// If provided, validate email format; on invalid, save NULL and warn
+			if($mtid>0 && $bname!==''){
+				$bemailParam = null;
+				if($bemail!==''){
+					$valid = false;
+					if(function_exists('filter_var') && defined('FILTER_VALIDATE_EMAIL')){
+						$valid = (bool)filter_var($bemail, FILTER_VALIDATE_EMAIL);
+					}else{
+						$valid = (bool)preg_match('/^[^@\s]+@[^@\s]+\.[^@\s]+$/', $bemail);
+					}
+					if($valid){
+						$bemailParam = $bemail;
+					}else{
+						$maitriseEmailWarnings[] = array('email'=>$bemail,'name'=>$bname);
+						$bemailParam = null;
+					}
+				}
+				try{
+					$ins->execute(array(":pid"=>$projectID, ":mtid"=>$mtid, ":bname"=>$bname, ":bemail"=>$bemailParam));
+				}catch(Exception $ex){
+					$maitriseEmailWarnings[] = array('email'=>$bemail,'name'=>$bname);
+				}
+			}
+		}
+	}
+
 	$title = __("openDCIM Project Information" );
+
+	// Prepare warnings HTML to be injected in form output
+	$maitriseEmailWarningsHtml = '';
+	if(!empty($maitriseEmailWarnings)){
+		$maitriseEmailWarningsHtml .= '<div class="warning">';
+		foreach($maitriseEmailWarnings as $w){
+			$msg = sprintf(__('Email "%s" for "%s" is invalid and was not saved.'), $w['email'], $w['name']);
+			$maitriseEmailWarningsHtml .= '<div>'.htmlspecialchars($msg).'</div>';
+		}
+		$maitriseEmailWarningsHtml .= '</div>';
+	}
 ?>
 <!doctype html>
 <html>
@@ -75,6 +195,7 @@
   <script type="text/javascript" src="scripts/jquery.miniColors.js"></script>
   <script type="text/javascript" src="scripts/jquery.validationEngine-en.js"></script>
   <script type="text/javascript" src="scripts/jquery.validationEngine.js"></script>
+  <script type="text/javascript" src="scripts/common.js?v<?php echo filemtime('scripts/common.js');?>"></script>
 <script type="text/javascript">
 	function showdevs(obj){
 		self.frames['projectadmin'].location.href='project_members.php?membertype=Device&projectid='+obj;
@@ -93,6 +214,9 @@ function showcabs(obj){
 		$('.main .center form').validationEngine('hide');		
 	}
 	$(document).ready(function(){
+		// Make project list searchable (type to filter)
+		$('#projectid').combobox();
+		$('span.custom-combobox').width($('span.custom-combobox').width()+2);
 		$('#projectid').change(function(e){
 			location.href='project_mgr.php?projectid='+this.value;
 		});
@@ -132,7 +256,8 @@ function showcabs(obj){
 	include( 'sidebar.inc.php' );
 	echo '<div class="main">
 <div class="center"><div>
-<form method="POST">
+<form method="POST">',
+$maitriseEmailWarningsHtml,'
 <div class="table centermargin">
 <div>
    <div>',__("Project"),'</div>
@@ -170,11 +295,102 @@ function showcabs(obj){
 ?>
 <div class="caption" id="controls">
 <?php
-	if($project->ProjectID > 0){
-		echo '<button type="submit" name="action" value="Update">',__("Update"),'</button><button type="button" name="action" value="Delete">',__("Delete"),'</button><button type="button" onClick="showdevs(',$project->ProjectID,')">',__("Assign Devices"),'</button><button type="button" onClick="showcabs(',$project->ProjectID,')">',__("Assign Cabinets"),'</button>';
-	}else{
-    	echo '<button type="submit" name="action" value="Create">',__("Create"),'</button>';
-	}
+    if($project->ProjectID > 0){
+        echo '<button type="submit" name="action" value="Update">',__("Update"),'</button><button type="button" name="action" value="Delete">',__("Delete"),'</button><button type="button" onClick="showdevs(',$project->ProjectID,')">',__("Assign Devices"),'</button><button type="button" onClick="showcabs(',$project->ProjectID,')">',__("Assign Cabinets"),'</button>';
+    }else{
+        echo '<button type="submit" name="action" value="Create">',__("Create"),'</button>';
+    }
+?>
+</div>
+
+<input type="hidden" name="deletetypeid" value="">
+<input type="hidden" name="updatetypeid" value="">
+<input type="hidden" name="updatename" value="">
+
+<div class="caption"><?php echo __("Maitrise"); ?><?php if($person->ContactAdmin){ ?>
+  <button type="button" id="manage-maitrise-types" style="float:right;">&nbsp;<?php echo __("Manage Maitrise Types"); ?></button>
+<?php } ?></div>
+<div>
+  <div><label><?php echo __("Maitrise Entries"); ?></label></div>
+  <div>
+    <div id="maitrise-rows">
+    <?php
+    // Render existing rows
+    if(!empty($projectMaitriseRows)){
+      foreach($projectMaitriseRows as $row){
+        echo '<div class="maitrise-row">';
+        echo '<select name="maitrise_type[]">';
+        foreach($maitriseTypes as $mt){
+          $sel = ($mt->MaitriseTypeID==$row['MaitriseTypeID'])? ' selected' : '';
+          echo '<option value="'.$mt->MaitriseTypeID.'"'.$sel.'>'.htmlspecialchars($mt->MaitriseName).'</option>';
+        }
+        echo '<option value="__more__">'.__("More").'</option>';
+        echo '</select> ';
+        echo '<input type="text" name="maitrise_bureau[]" placeholder="'.__("Bureau Name").'" value="'.htmlspecialchars($row['BureauName']).'"> ';
+        echo '<input type="email" class="validate[custom[email]]" name="maitrise_email[]" placeholder="'.__("Email").'" value="'.htmlspecialchars($row['BureauEmail']).'"> ';
+        echo '<button type="button" class="removemaitrise">'.__("Remove").'</button>';
+        echo '</div>';
+      }
+    }
+    ?>
+    </div>
+    <button type="button" id="add-maitrise"><?php echo __("Add Maitrise"); ?></button>
+    <div id="maitrise-template" style="display:none;">
+      <div class="maitrise-row">
+        <select name="maitrise_type[]">
+          <?php foreach($maitriseTypes as $mt){ echo '<option value="'.$mt->MaitriseTypeID.'">'.htmlspecialchars($mt->MaitriseName).'</option>'; } ?>
+          <option value="__more__"><?php echo __("More"); ?></option>
+        </select>
+        <input type="text" name="maitrise_bureau[]" placeholder="<?php echo __("Bureau Name"); ?>">
+        <input type="email" class="validate[custom[email]]" name="maitrise_email[]" placeholder="<?php echo __("Email"); ?>">
+        <button type="button" class="removemaitrise"><?php echo __("Remove"); ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+<?php if($person->ContactAdmin){ ?>
+<!-- Maitrise Types modal moved outside form; uses hidden fields in main form -->
+<div id="maitrisetypesmodal" title="<?php echo __("Maitrise Types"); ?>" style="display:none;">
+  <div>
+    <div><strong><?php echo __("Existing Types"); ?></strong></div>
+    <div>
+      <table class="dcim-table" style="width:100%;">
+        <thead>
+          <tr><th><?php echo __("Type Name"); ?></th><th style="width:160px;">&nbsp;</th></tr>
+        </thead>
+        <tbody>
+        <?php foreach($maitriseTypes as $mt){ ?>
+          <tr>
+            <td>
+              <input type="text" name="mt_name_<?php echo $mt->MaitriseTypeID; ?>" value="<?php echo htmlspecialchars($mt->MaitriseName); ?>" style="width:100%;">
+            </td>
+            <td>
+              <button type="button" class="mt-save" data-id="<?php echo $mt->MaitriseTypeID; ?>" data-action="UpdateType"><?php echo __("Save"); ?></button>
+              <button type="button" class="mt-delete" data-id="<?php echo $mt->MaitriseTypeID; ?>" data-action="DeleteType"><?php echo __("Delete"); ?></button>
+            </td>
+          </tr>
+        <?php } ?>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div style="margin-top:10px;">
+    <div><strong><?php echo __("Add New Maitrise Type"); ?></strong></div>
+    <div>
+      <input type="text" id="newmaitrise" maxlength="100" style="width:60%;">
+      <button type="button" id="add-maitrise-type" data-action="AddType"><?php echo __("Add"); ?></button>
+    </div>
+  </div>
+  <p class="note"><?php echo __("Changes save immediately when you click Save/Delete."); ?></p>
+</div>
+<?php } ?>
+<div class="caption" id="controls">
+<?php
+    if($project->ProjectID > 0){
+        echo '<button type="submit" name="action" value="Update">',__("Update"),'</button><button type="button" name="action" value="Delete">',__("Delete"),'</button><button type="button" onClick="showdevs(',$project->ProjectID,')">',__("Assign Devices"),'</button><button type="button" onClick="showcabs(',$project->ProjectID,')">',__("Assign Cabinets"),'</button>';
+    }else{
+        echo '<button type="submit" name="action" value="Create">',__("Create"),'</button>';
+    }
 ?>
 </div>
 </div> <!-- END div.table -->
@@ -198,5 +414,85 @@ function showcabs(obj){
     this.style.height =
     this.contentWindow.document.body.offsetHeight + 'px';
 });
+<?php if($person->ContactAdmin){ ?>
+// Open modal for Maitrise Types
+$('#manage-maitrise-types').on('click', function(){
+  $('#maitrisetypesmodal').dialog({
+    modal:true,
+    width: 'auto'
+  });
+});
+<?php } ?>
+// Vanilla JS for Maitrise rows
+document.addEventListener('DOMContentLoaded', function(){
+  var addBtn = document.getElementById('add-maitrise');
+  var rows = document.getElementById('maitrise-rows');
+  var tmpl = document.getElementById('maitrise-template');
+  if(addBtn && rows && tmpl){
+    addBtn.addEventListener('click', function(){
+      var node = tmpl.firstElementChild.cloneNode(true);
+      rows.appendChild(node);
+    });
+    rows.addEventListener('click', function(e){
+      if(e.target && e.target.classList.contains('removemaitrise')){
+        var r = e.target.closest('.maitrise-row');
+        if(r){ r.remove(); }
+      }
+    });
+  }
+  // Open modal when selecting "More" in type dropdown
+  $(document).on('change','select[name="maitrise_type[]"]', function(){
+    if(this.value==='__more__'){
+      // reset to first real option after opening
+      var firstVal = $(this).find('option').not('[value="__more__"]').first().val();
+      // Open the modal (same settings as the button)
+      $('#maitrisetypesmodal').dialog({ modal:true, width:'auto' });
+      // Revert selection
+      if(firstVal!==undefined){ $(this).val(firstVal); }
+    }
+  });
+  // Maitrise Types modal buttons - submit main form
+  var modal = document.getElementById('maitrisetypesmodal');
+  if(modal){
+    modal.addEventListener('click', function(e){
+      var form = document.querySelector('.main .center form');
+      if(!form){ return; }
+      if(e.target && e.target.classList.contains('mt-save')){
+        var id = e.target.getAttribute('data-id');
+        var input = modal.querySelector('input[name="mt_name_'+id+'"]');
+        if(input){
+          form.querySelector('input[name=updatetypeid]').value = id;
+          form.querySelector('input[name=updatename]').value = input.value;
+          var a = document.createElement('input');
+          a.type='hidden'; a.name='mt_action'; a.value='UpdateType';
+          form.appendChild(a);
+          form.submit();
+        }
+      } else if(e.target && e.target.classList.contains('mt-delete')){
+        var idd = e.target.getAttribute('data-id');
+        form.querySelector('input[name=deletetypeid]').value = idd;
+        var a2 = document.createElement('input');
+        a2.type='hidden'; a2.name='mt_action'; a2.value='DeleteType';
+        form.appendChild(a2);
+        form.submit();
+      }
+    });
+    var addTypeBtn = document.getElementById('add-maitrise-type');
+    if(addTypeBtn){
+      addTypeBtn.addEventListener('click', function(){
+        var form = document.querySelector('.main .center form');
+        var val = document.getElementById('newmaitrise').value.trim();
+        if(form && val!==''){
+          var a3 = document.createElement('input');
+          a3.type='hidden'; a3.name='mt_action'; a3.value='AddType';
+          var nv = document.createElement('input');
+          nv.type='hidden'; nv.name='newmaitrise'; nv.value=val;
+          form.appendChild(a3); form.appendChild(nv);
+          form.submit();
+        }
+      });
+    }
+  }
+});
 </script>
 </html>
diff --git a/readme_Project_mgr.me b/readme_Project_mgr.me
new file mode 100644
index 000000000..a8b978f2d
--- /dev/null
+++ b/readme_Project_mgr.me
@@ -0,0 +1,61 @@
+Vue D’Ensemble
+
+Page de gestion des projets: créer, modifier, supprimer un projet et gérer ses “Maitrise” (bureaux/types), ainsi que l’association de matériels (devices/cabinets).
+Accès via Project dans le menu; la liste est filtrable (recherche intégrée).
+Accès
+
+Permissions d’écriture requises pour créer/modifier des projets.
+Les actions “Gérer les types de Maitrise” sont réservées aux administrateurs de contacts.
+Sélection Du Projet
+
+Sélectionner un projet dans la liste en haut; le changement charge automatiquement le projet choisi.
+Option “New Project” pour créer un projet.
+Champs Projet
+
+Project Name: obligatoire.
+Project Sponsor: optionnel.
+Project Start Date, Expiration Date, Actual End Date: optionnels; format de date YYYY-MM-DD avec sélecteur calendrier.
+Les validations de formulaire guident la saisie (ex. nom requis).
+Actions
+
+Create: enregistre un nouveau projet et recharge la page du projet créé.
+Update: sauvegarde les modifications du projet courant et des lignes “Maitrise”.
+Delete: ouvre une confirmation. Supprime le projet; les devices sont dés-associés, pas supprimés. Action irréversible.
+Maitrise (Bureaux)
+
+Section “Maitrise Entries”: ajoutez une ou plusieurs lignes.
+Par ligne:
+Type: sélectionner un type de Maitrise.
+Bureau Name: nom du bureau, obligatoire.
+Email: email du bureau, optionnel.
+Boutons:
+Add Maitrise: ajoute une nouvelle ligne vide.
+Remove: supprime la ligne correspondante.
+Règles Email
+
+Non obligatoire: si laissé vide, l’email est enregistré à NULL.
+Si saisi, le format est vérifié:
+Valide: enregistré tel quel.
+Invalide: non enregistré (remplacé par NULL) et un avertissement s’affiche en haut du formulaire.
+L’enregistrement des autres champs n’est pas bloqué par un email manquant/invalide.
+Types De Maitrise (Admin)
+
+Bouton “Manage Maitrise Types”:
+Modifier/Supprimer des types existants (sauvegarde immédiate).
+Ajouter un nouveau type.
+Dans les listes Type, l’option “More” ouvre également la gestion des types.
+Association D’Éléments
+
+Assign Devices / Assign Cabinets: ouvre un panneau (iframe) pour associer/dissocier des équipements ou armoires au projet courant.
+Pendant l’assignation, les champs du formulaire principal sont mis en lecture seule.
+Conseils & Dépannage
+
+Champs requis: renseigner “Project Name” pour créer/mettre à jour.
+Dates: utiliser le sélecteur pour éviter des formats invalides.
+Email: laissez vide si vous n’en avez pas; en cas de message d’avertissement, corrigez le format si nécessaire.
+Suppression: vérifiez bien le contenu du projet; l’action ne peut pas être annulée.
+Références Fonctionnelles
+
+Email optionnel et avertissements: project_mgr.php:144, project_mgr.php:147, project_mgr.php:172.
+Insertion des avertissements dans le formulaire: project_mgr.php:168, project_mgr.php:173, project_mgr.php:260.
+Champs et actions de base du projet (formulaire): project_mgr.php:259, project_mgr.php:260, project_mgr.php:383.
\ No newline at end of file