From 5daf15901acdd124a1bd102f83a0d31c89157565 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 16 Sep 2022 02:20:00 +0200
Subject: [PATCH 1/4] Correction erreur xp restant

---
 module/actor.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index f1496e1f..6085a5f9 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -929,26 +929,27 @@ export class RdDActor extends Actor {
     if (!competence) {
       return;
     }
+    const stress = this.system.compteurs.experience.value;
     const niveau = Number(competence.system.niveau);
-    const stressTransforme = this.system.compteurs.experience.value;
-    const xpRequis = RdDItemCompetence.getCompetenceNextXp(niveau) - competence.system.xp;
-    if (stressTransforme <= 0 || niveau >= competence.system.niveau_archetype || xpRequis <= 0) {
+    const xpSuivant = RdDItemCompetence.getCompetenceNextXp(niveau);
+    const xpRequis = xpSuivant - competence.system.xp;
+    if (stress <= 0 || niveau >= competence.system.niveau_archetype) {
       ui.notifications.info(`La compétence ne peut pas augmenter!
-          stress disponible: ${stressTransforme}
+          stress disponible: ${stress}
           expérience requise: ${xpRequis}
           niveau : ${niveau}
           archétype : ${competence.system.niveau_archetype}`);
       return;
     }
-    const xpUtilise = Math.min(stressTransforme, xpRequis);
-    const gainNiveau = xpUtilise >= xpRequis ? 1 : 0;
+    const xpUtilise = Math.max(0, Math.min(stress, xpRequis));
+    const gainNiveau = (xpUtilise >= xpRequis || xpRequis <=0) ? 1 : 0;
     const nouveauNiveau = niveau + gainNiveau;
-    const nouveauXp = gainNiveau > 0 ? Math.max(competence.system.xp - xpRequis, 0) : (competence.system.xp + xpUtilise);
+    const nouveauXp = gainNiveau > 0 ? Math.max(competence.system.xp - xpSuivant, 0) : (competence.system.xp + xpUtilise);
     await competence.update({
       "system.xp": nouveauXp,
       "system.niveau": nouveauNiveau,
     });
-    const stressTransformeRestant = Math.max(0, stressTransforme - xpUtilise);
+    const stressTransformeRestant = Math.max(0, stress - xpUtilise);
     await this.update({ "system.compteurs.experience.value": stressTransformeRestant });
     this.updateExperienceLog('Dépense stress', xpUtilise, `Stress en ${competence.name} ${gainNiveau ? "pour passer à " + nouveauNiveau : ""}`);
   }

From 8f1ee315ef45999ecdc638c856c456392830be57 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 16 Sep 2022 02:20:46 +0200
Subject: [PATCH 2/4] =?UTF-8?q?Template=20en-t=C3=AAte=20standard?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/rdd-utility.js                        |   1 +
 templates/header-item.html                   |   6 +
 templates/item-arme-sheet.html               |   7 +-
 templates/item-armure-sheet.html             |  58 ++++---
 templates/item-casetmr-sheet.html            |  41 ++---
 templates/item-chant-sheet.html              |  34 ++--
 templates/item-competencecreature-sheet.html |  90 +++++------
 templates/item-conteneur-sheet.html          |  78 +++++-----
 templates/item-danse-sheet.html              |  68 ++++----
 templates/item-gemme-sheet.html              |  10 +-
 templates/item-ingredient-sheet.html         |   9 +-
 templates/item-jeu-sheet.html                |  65 ++++----
 templates/item-meditation-sheet.html         | 154 +++++++++----------
 templates/item-monnaie-sheet.html            |  50 +++---
 templates/item-munition-sheet.html           |  50 +++---
 templates/item-musique-sheet.html            |  34 ++--
 templates/item-nombreastral-sheet.html       |  47 +++---
 templates/item-nourritureboisson-sheet.html  |  10 +-
 templates/item-objet-sheet.html              |  58 +++----
 templates/item-ombre-sheet.html              |  26 ++--
 templates/item-possession-sheet.html         |  44 ++----
 templates/item-queue-sheet.html              |  26 ++--
 templates/item-recettealchimique-sheet.html  |  66 ++++----
 templates/item-recettecuisine-sheet.html     |  68 ++++----
 templates/item-rencontresTMR-sheet.html      |  19 +--
 templates/item-sort-sheet.html               | 150 +++++++++---------
 templates/item-souffle-sheet.html            |  18 +--
 templates/item-tache-sheet.html              | 134 ++++++++--------
 templates/item-tarot-sheet.html              |  44 +++---
 templates/item-tete-sheet.html               |  18 +--
 30 files changed, 636 insertions(+), 847 deletions(-)
 create mode 100644 templates/header-item.html

diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 991c7506..3ceecdac 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -130,6 +130,7 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html',
       'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html',
       //Items
+      'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-competencecreature-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/item-arme-sheet.html',
diff --git a/templates/header-item.html b/templates/header-item.html
new file mode 100644
index 00000000..3638564a
--- /dev/null
+++ b/templates/header-item.html
@@ -0,0 +1,6 @@
+<header class="sheet-header">
+    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+    <div class="header-fields">
+        <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+    </div>
+</header>
diff --git a/templates/item-arme-sheet.html b/templates/item-arme-sheet.html
index c6e27293..94e79fe5 100644
--- a/templates/item-arme-sheet.html
+++ b/templates/item-arme-sheet.html
@@ -1,10 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
     
     {{!-- Sheet Body --}}
     <section class="sheet-body">
diff --git a/templates/item-armure-sheet.html b/templates/item-armure-sheet.html
index 5bb8e062..96aebe11 100644
--- a/templates/item-armure-sheet.html
+++ b/templates/item-armure-sheet.html
@@ -1,35 +1,29 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Protection</label>
-        <input class="attribute-value" type="text" name="system.protection" value="{{system.protection}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Détérioration</label>
-        <input class="attribute-value" type="text" name="system.deterioration" value="{{system.deterioration}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Malus Armure </label>
-        <input class="attribute-value" type="text" name="system.malus" value="{{system.malus}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group item-cout">
-        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    </section>
-    
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Protection</label>
+      <input class="attribute-value" type="text" name="system.protection" value="{{system.protection}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Encombrement </label>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Détérioration</label>
+      <input class="attribute-value" type="text" name="system.deterioration" value="{{system.deterioration}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Malus Armure </label>
+      <input class="attribute-value" type="text" name="system.malus" value="{{system.malus}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group item-cout">
+      <label for="xp">Prix (sols) </label>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
+    </div>
+
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-casetmr-sheet.html b/templates/item-casetmr-sheet.html
index 7f6216c3..c5c8292b 100644
--- a/templates/item-casetmr-sheet.html
+++ b/templates/item-casetmr-sheet.html
@@ -1,27 +1,20 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="niveau">Coordonnées TMR </label>
-        <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="niveau">Mode spécifique</label>
-        <select name="system.specific" id="specific" data-dtype="String">
-          {{#select system.specific}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html"}}
-          {{/select}}
-      </select>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="niveau">Coordonnées TMR </label>
+      <input class="attribute-value" type="text" name="system.coord" value="{{system.coord}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="niveau">Mode spécifique</label>
+      <select name="system.specific" id="specific" data-dtype="String">
+        {{#select system.specific}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/casetmr-specific-list.html"}}
+        {{/select}}
+    </select>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-chant-sheet.html b/templates/item-chant-sheet.html
index c854406a..7fbd9714 100644
--- a/templates/item-chant-sheet.html
+++ b/templates/item-chant-sheet.html
@@ -1,24 +1,16 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Niveau</label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Référence / Auteur</label>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-      
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-competencecreature-sheet.html b/templates/item-competencecreature-sheet.html
index 174fd57b..2e912a9a 100644
--- a/templates/item-competencecreature-sheet.html
+++ b/templates/item-competencecreature-sheet.html
@@ -1,52 +1,44 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="niveau">Niveau </label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="niveau">Valeur de Caractéristique </label>
-        <input class="attribute-value" type="text" name="system.carac_value" value="{{system.carac_value}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="default_diffLibre">Difficulté libre par défaut</label>
-        <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{system.default_diffLibre}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Arme ? </label>
-        <input class="attribute-value" type="checkbox" name="system.iscombat"  {{#if system.iscombat}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Parade ? </label>
-        <input class="attribute-value" type="checkbox" name="system.isparade"  {{#if system.isparade}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Possession ? </label>
-        <input class="attribute-value" type="checkbox" name="system.ispossession"  {{#if system.ispossession}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label>Catégorie parade </label>
-        <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
-          {{#select system.categorie_parade}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
-          {{/select}}
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="niveau">Dommages (+dom), si applicable </label>
-        <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="niveau">Niveau </label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="niveau">Valeur de Caractéristique </label>
+      <input class="attribute-value" type="text" name="system.carac_value" value="{{system.carac_value}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="default_diffLibre">Difficulté libre par défaut</label>
+      <input class="attribute-value" type="text" name="system.default_diffLibre" value="{{system.default_diffLibre}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Arme ? </label>
+      <input class="attribute-value" type="checkbox" name="system.iscombat"  {{#if system.iscombat}}checked{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Parade ? </label>
+      <input class="attribute-value" type="checkbox" name="system.isparade"  {{#if system.isparade}}checked{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Possession ? </label>
+      <input class="attribute-value" type="checkbox" name="system.ispossession"  {{#if system.ispossession}}checked{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label>Catégorie parade </label>
+      <select name="system.categorie_parade" id="categorie_parade" data-dtype="String">
+        {{#select system.categorie_parade}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="niveau">Dommages (+dom), si applicable </label>
+      <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+    </section>
 </form>
diff --git a/templates/item-conteneur-sheet.html b/templates/item-conteneur-sheet.html
index f0621121..5087516a 100644
--- a/templates/item-conteneur-sheet.html
+++ b/templates/item-conteneur-sheet.html
@@ -1,47 +1,39 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Capacite (points d'Encombrement portable)</label>
-        <input class="attribute-value" type="text" name="system.capacite" value="{{system.capacite}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group item-cout">
-        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
-      </div>
-      {{#if isOwned}}
-      <div class="flexcol">
-        <span><label>Contenu : </label></span>
-        <ul class="item-list alterne-list">
-          <li class="competence-header flexrow">
-            <span class="equipement-nom">Nom</span>
-            <span class="equipement-detail">Q.</span>
-            <span class="equipement-detail">Enc.</span>
-            <span class="equipement-actions">Actions</span>
-          </li>
-           {{buildContenu this}}
-        </ul>
-      </div>
-      {{/if}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Encombrement </label>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Capacite (points d'Encombrement portable)</label>
+      <input class="attribute-value" type="text" name="system.capacite" value="{{system.capacite}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Qualité</label>
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group item-cout">
+      <label for="xp">Prix (sols) </label>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
+    </div>
+    {{#if isOwned}}
+    <div class="flexcol">
+      <span><label>Contenu : </label></span>
+      <ul class="item-list alterne-list">
+        <li class="competence-header flexrow">
+          <span class="equipement-nom">Nom</span>
+          <span class="equipement-detail">Q.</span>
+          <span class="equipement-detail">Enc.</span>
+          <span class="equipement-actions">Actions</span>
+        </li>
+          {{buildContenu this}}
+      </ul>
+    </div>
+    {{/if}}
 
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-danse-sheet.html b/templates/item-danse-sheet.html
index 956dd877..59e0f358 100644
--- a/templates/item-danse-sheet.html
+++ b/templates/item-danse-sheet.html
@@ -1,41 +1,33 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Type</label>
-        <select name="system.type" data-dtype="String">
-          {{#select system.type}}
-          <option value="recreative">Récréative</option>
-          <option value="soliste">Soliste</option>
-          {{/select}}    
-        </select>
-      </div>
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Agilité ?</label>
-        <input class="attribute-value" type="checkbox" name="system.agilite" {{#if system.agilite}}checked{{/if}}/>    
-      </div>
-      <div class="form-group">
-          <label class="alchimie-title" for="xp">Apparence ?</label>
-        <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if system.apparence}}checked{{/if}}/>    
-      </div>
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Type</label>
+      <select name="system.type" data-dtype="String">
+        {{#select system.type}}
+        <option value="recreative">Récréative</option>
+        <option value="soliste">Soliste</option>
+        {{/select}}    
+      </select>
+    </div>
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Agilité ?</label>
+      <input class="attribute-value" type="checkbox" name="system.agilite" {{#if system.agilite}}checked{{/if}}/>    
+    </div>
+    <div class="form-group">
+        <label class="alchimie-title" for="xp">Apparence ?</label>
+      <input class="attribute-value" type="checkbox" name="system.apparence"  {{#if system.apparence}}checked{{/if}}/>    
+    </div>
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Niveau</label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Référence / Auteur</label>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-gemme-sheet.html b/templates/item-gemme-sheet.html
index 79b45b3d..f7151737 100644
--- a/templates/item-gemme-sheet.html
+++ b/templates/item-gemme-sheet.html
@@ -1,11 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
-
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
@@ -50,7 +44,5 @@
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-
 </form>
\ No newline at end of file
diff --git a/templates/item-ingredient-sheet.html b/templates/item-ingredient-sheet.html
index 27b6d7e7..f9e273d8 100644
--- a/templates/item-ingredient-sheet.html
+++ b/templates/item-ingredient-sheet.html
@@ -1,10 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
 
   {{!-- Sheet Body --}}
   <section class="sheet-body">
@@ -48,7 +43,5 @@
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-
 </form>
\ No newline at end of file
diff --git a/templates/item-jeu-sheet.html b/templates/item-jeu-sheet.html
index 9b2bb091..e562b5c1 100644
--- a/templates/item-jeu-sheet.html
+++ b/templates/item-jeu-sheet.html
@@ -1,39 +1,32 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Type</label>
-        <select name="system.type" data-dtype="String">
-          {{#select system.type}}
-          <option value="adressehasard">Adresse/Hasard</option>
-          <option value="de">Dés</option>
-          <option value="carte">Cartes</option>
-          <option value="reflexion">Reflexion</option>
-          {{/select}}    
-        </select>
-      </div>
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Base</label>
-        <input class="attribute-value" type="text" name="system.base" value="{{system.base}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Caractéristique/Compétence</label>
-        <input class="attribute-value" type="text" name="system.caraccomp" value="{{system.caraccomp}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Type</label>
+      <select name="system.type" data-dtype="String">
+        {{#select system.type}}
+        <option value="adressehasard">Adresse/Hasard</option>
+        <option value="de">Dés</option>
+        <option value="carte">Cartes</option>
+        <option value="reflexion">Reflexion</option>
+        {{/select}}    
+      </select>
+    </div>
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Base</label>
+      <input class="attribute-value" type="text" name="system.base" value="{{system.base}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Caractéristique/Compétence</label>
+      <input class="attribute-value" type="text" name="system.caraccomp" value="{{system.caraccomp}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label>Référence / Auteur</label>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
+    </div>
+
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-meditation-sheet.html b/templates/item-meditation-sheet.html
index 48cd1b5d..21db9a13 100644
--- a/templates/item-meditation-sheet.html
+++ b/templates/item-meditation-sheet.html
@@ -1,84 +1,76 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
-          {{#select system.competence}}
-          {{#each competences as |competence key|}}
-          <option value="{{competence.name}}">{{competence.name}}</option>
-          {{/each}}
-          {{/select}}    
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="xp">Thème</label>
-        <input class="attribute-value" type="text" name="system.theme" value="{{system.theme}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Support</label>
-        <input class="attribute-value" type="text" name="system.support" value="{{system.support}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Heure</label>
-        <select name="system.heure" id="heure" data-dtype="String">
-          {{#select system.heure}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
-          {{/select}}
-        </select>        
-      </div>
-      <div class="form-group">
-        <label for="xp">Purification</label>
-        <input class="attribute-value" type="text" name="system.purification" value="{{system.purification}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Vêture</label>
-        <input class="attribute-value" type="text" name="system.veture" value="{{system.veture}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Comportement</label>
-        <input class="attribute-value" type="text" name="system.comportement" value="{{system.comportement}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Case TMR</label>
-        <select name="system.tmr" id="tmr" data-dtype="String">
-          {{#select system.tmr}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
-          {{/select}}
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="xp">Malus</label>
-        {{#if isGM}}
-        <select name="system.malus" id="malus" data-dtype="Number">
-          {{#select system.malus}}
-          <option value="0">0</option>
-          <option value="-1">-1</option>
-          <option value="-2">-2</option>
-          <option value="-3">-3</option>
-          <option value="-4">-4</option>
-          <option value="-5">-5</option>
-          <option value="-6">-6</option>
-          <option value="-7">-7</option>
-          <option value="-8">-8</option>
-          <option value="-9">-9</option>
-          <option value="-10">-10</option>
-          {{/select}}
-        </select>
-        {{else}}
-        <label>>{{system.malus}}</label>
-        {{/if}}
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Compétence</label>
+      <select name="system.competence" id="competenceselect" data-dtype="String">
+        {{#select system.competence}}
+        {{#each competences as |competence key|}}
+        <option value="{{competence.name}}">{{competence.name}}</option>
+        {{/each}}
+        {{/select}}    
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="xp">Thème</label>
+      <input class="attribute-value" type="text" name="system.theme" value="{{system.theme}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Support</label>
+      <input class="attribute-value" type="text" name="system.support" value="{{system.support}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Heure</label>
+      <select name="system.heure" id="heure" data-dtype="String">
+        {{#select system.heure}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
+        {{/select}}
+      </select>        
+    </div>
+    <div class="form-group">
+      <label for="xp">Purification</label>
+      <input class="attribute-value" type="text" name="system.purification" value="{{system.purification}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Vêture</label>
+      <input class="attribute-value" type="text" name="system.veture" value="{{system.veture}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Comportement</label>
+      <input class="attribute-value" type="text" name="system.comportement" value="{{system.comportement}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Case TMR</label>
+      <select name="system.tmr" id="tmr" data-dtype="String">
+        {{#select system.tmr}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
+        {{/select}}
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="xp">Malus</label>
+      {{#if isGM}}
+      <select name="system.malus" id="malus" data-dtype="Number">
+        {{#select system.malus}}
+        <option value="0">0</option>
+        <option value="-1">-1</option>
+        <option value="-2">-2</option>
+        <option value="-3">-3</option>
+        <option value="-4">-4</option>
+        <option value="-5">-5</option>
+        <option value="-6">-6</option>
+        <option value="-7">-7</option>
+        <option value="-8">-8</option>
+        <option value="-9">-9</option>
+        <option value="-10">-10</option>
+        {{/select}}
+      </select>
+      {{else}}
+      <label>>{{system.malus}}</label>
+      {{/if}}
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-monnaie-sheet.html b/templates/item-monnaie-sheet.html
index 246d35d8..a105d6c0 100644
--- a/templates/item-monnaie-sheet.html
+++ b/templates/item-monnaie-sheet.html
@@ -1,32 +1,24 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Quantité</label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Valeur en Deniers</label>
-        {{#if isGM}}
-        <input class="attribute-value" type="text" name="system.valeur_deniers" value="{{system.valeur_deniers}}" data-dtype="Number"/>
-        {{else}}
-        <label for="xp">{{system.valeur_deniers}}</label>
-        {{/if}}
-      </div>
-      <div class="form-group">
-        <label for="xp">Encombrement</label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Quantité</label>
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Valeur en Deniers</label>
+      {{#if isGM}}
+      <input class="attribute-value" type="text" name="system.valeur_deniers" value="{{system.valeur_deniers}}" data-dtype="Number"/>
+      {{else}}
+      <label for="xp">{{system.valeur_deniers}}</label>
+      {{/if}}
+    </div>
+    <div class="form-group">
+      <label for="xp">Encombrement</label>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-munition-sheet.html b/templates/item-munition-sheet.html
index 723ed15c..149515f1 100644
--- a/templates/item-munition-sheet.html
+++ b/templates/item-munition-sheet.html
@@ -1,32 +1,24 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Quantité </label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
-      </div>      
-      <div class="form-group">
-        <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group item-cout">
-        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Encombrement </label>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Quantité </label>
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
+    </div>      
+    <div class="form-group">
+      <label for="xp">Qualité</label>
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group item-cout">
+      <label for="xp">Prix (sols) </label>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-musique-sheet.html b/templates/item-musique-sheet.html
index b49496b8..7fbd9714 100644
--- a/templates/item-musique-sheet.html
+++ b/templates/item-musique-sheet.html
@@ -1,24 +1,16 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">Niveau</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">Niveau</label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Référence / Auteur</label>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-nombreastral-sheet.html b/templates/item-nombreastral-sheet.html
index 86f8a9a0..d48bbfcc 100644
--- a/templates/item-nombreastral-sheet.html
+++ b/templates/item-nombreastral-sheet.html
@@ -1,30 +1,23 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Nombre</label>
+      <input class="attribute-value" type="text" name="system.value" value="{{system.value}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Nombre valide ? </label>
+      <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Index du jour concerné</label>
+      <input class="attribute-value" type="text" name="system.jourindex" value="{{system.jourindex}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Label du jour</label>
+      <input class="attribute-value" type="text" name="system.jourlabel" value="{{system.jourlabel}}" data-dtype="String"/>
+    </div>
 
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Nombre</label>
-        <input class="attribute-value" type="text" name="system.value" value="{{system.value}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Nombre valide ? </label>
-        <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Index du jour concerné</label>
-        <input class="attribute-value" type="text" name="system.jourindex" value="{{system.jourindex}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Label du jour</label>
-        <input class="attribute-value" type="text" name="system.jourlabel" value="{{system.jourlabel}}" data-dtype="String"/>
-      </div>
-
-    </section>
-    
+  </section>
 </form>
diff --git a/templates/item-nourritureboisson-sheet.html b/templates/item-nourritureboisson-sheet.html
index c19bb669..9f1933dc 100644
--- a/templates/item-nourritureboisson-sheet.html
+++ b/templates/item-nourritureboisson-sheet.html
@@ -1,11 +1,5 @@
 <form class="{{cssClass}}" autocomplete="off">
-  <header class="sheet-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
-    <div class="header-fields">
-      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
-    </div>
-  </header>
-
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
   {{!-- Sheet Body --}}
   <section class="sheet-body">
     <div class="form-group">
@@ -55,7 +49,5 @@
     </div>
 
     {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
   </section>
-
 </form>
\ No newline at end of file
diff --git a/templates/item-objet-sheet.html b/templates/item-objet-sheet.html
index 7d812a86..2737332c 100644
--- a/templates/item-objet-sheet.html
+++ b/templates/item-objet-sheet.html
@@ -1,36 +1,28 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Encombrement </label>
-        <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Quantité </label>
-        <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
-      </div>
-      <div class="form-group">
-        <label for="xp">Résistance</label>
-        <input class="attribute-value" type="text" name="system.resistance" value="{{system.resistance}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Qualité</label>
-        <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group item-cout">
-        <label for="xp">Prix (sols) </label>
-        <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Encombrement </label>
+      <input class="attribute-value" type="text" name="system.encombrement" value="{{system.encombrement}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Quantité </label>
+      <input class="attribute-value" type="text" name="system.quantite" value="{{system.quantite}}" data-dtype="Number" />
+    </div>
+    <div class="form-group">
+      <label for="xp">Résistance</label>
+      <input class="attribute-value" type="text" name="system.resistance" value="{{system.resistance}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Qualité</label>
+      <input class="attribute-value" type="text" name="system.qualite" value="{{system.qualite}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group item-cout">
+      <label for="xp">Prix (sols) </label>
+      <input class="attribute-value" type="text" name="system.cout" value="{{system.cout}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+    </section>
 </form>
diff --git a/templates/item-ombre-sheet.html b/templates/item-ombre-sheet.html
index 663b6373..542c39c5 100644
--- a/templates/item-ombre-sheet.html
+++ b/templates/item-ombre-sheet.html
@@ -1,20 +1,12 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Refoulement</label>
-        <input class="attribute-value" type="text" name="system.refoulement" value="{{system.refoulement}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Refoulement</label>
+      <input class="attribute-value" type="text" name="system.refoulement" value="{{system.refoulement}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-possession-sheet.html b/templates/item-possession-sheet.html
index 8676271f..57cb0977 100644
--- a/templates/item-possession-sheet.html
+++ b/templates/item-possession-sheet.html
@@ -1,29 +1,19 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-        <div class="form-group">
-          <label for="xp">Type de possession </label>
-          <input class="attribute-value" type="text" name="system.typepossession" value="{{system.typepossession}}" data-dtype="String"/>
-        </div>
-        <div class="form-group">
-          <label for="xp">Possédé ? </label>
-          <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
-        </div>
-        <div class="form-group">
-          <label for="xp">Compteur </label>
-          <input class="attribute-value" type="text" name="system.compteur" value="{{system.compteur}}" data-dtype="Number"/>
-        </div>
-  
-      
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+      <div class="form-group">
+        <label for="xp">Type de possession </label>
+        <input class="attribute-value" type="text" name="system.typepossession" value="{{system.typepossession}}" data-dtype="String"/>
+      </div>
+      <div class="form-group">
+        <label for="xp">Possédé ? </label>
+        <input class="attribute-value" type="checkbox" name="system.istrue"  {{#if system.istrue}}checked{{/if}}/>
+      </div>
+      <div class="form-group">
+        <label for="xp">Compteur </label>
+        <input class="attribute-value" type="text" name="system.compteur" value="{{system.compteur}}" data-dtype="Number"/>
+      </div>
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-queue-sheet.html b/templates/item-queue-sheet.html
index 663b6373..542c39c5 100644
--- a/templates/item-queue-sheet.html
+++ b/templates/item-queue-sheet.html
@@ -1,20 +1,12 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Refoulement</label>
-        <input class="attribute-value" type="text" name="system.refoulement" value="{{system.refoulement}}" data-dtype="Number"/>
-      </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Refoulement</label>
+      <input class="attribute-value" type="text" name="system.refoulement" value="{{system.refoulement}}" data-dtype="Number"/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-recettealchimique-sheet.html b/templates/item-recettealchimique-sheet.html
index b0149575..b476b22b 100644
--- a/templates/item-recettealchimique-sheet.html
+++ b/templates/item-recettealchimique-sheet.html
@@ -1,44 +1,36 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label class="alchimie-title" for="xp">But</label>
-        <input class="attribute-value" type="text" name="system.but" value="{{system.but}}" data-dtype="String"/>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label class="alchimie-title" for="xp">But</label>
+      <input class="attribute-value" type="text" name="system.but" value="{{system.but}}" data-dtype="String"/>
+    </div>
+    <div class="flexcol">
+      <span><label class="alchimie-title">Manipulation : </label></span>
+      <div class="form-group medium-editor">
+        {{editor system.manipulation_update target="system.manipulation" button=true owner=owner editable=editable}}
       </div>
-      <div class="flexcol">
-        <span><label class="alchimie-title">Manipulation : </label></span>
-        <div class="form-group medium-editor">
-          {{editor system.manipulation_update target="system.manipulation" button=true owner=owner editable=editable}}
-        </div>
+    </div>
+    <div class="flexcol">
+      <span><label class="alchimie-title">Utilisation : </label></span>
+      <div class="form-group small-editor">
+        {{editor system.utilisation target="system.utilisation" button=true owner=owner editable=editable}}
       </div>
-      <div class="flexcol">
-        <span><label class="alchimie-title">Utilisation : </label></span>
-        <div class="form-group small-editor">
-          {{editor system.utilisation target="system.utilisation" button=true owner=owner editable=editable}}
-        </div>
+    </div>
+    <div class="flexcol">
+      <span><label class="alchimie-title">Enchantement : </label></span>
+      <div class="form-group small-editor">
+        {{editor system.enchantement target="system.enchantement" button=true owner=owner editable=editable}}
       </div>
-      <div class="flexcol">
-        <span><label class="alchimie-title">Enchantement : </label></span>
-        <div class="form-group small-editor">
-          {{editor system.enchantement target="system.enchantement" button=true owner=owner editable=editable}}
-        </div>
-      </div>
-      <div class="flexcol">
-        <span><label class="alchimie-title">Sur-effet : </label></span>
-        <div class="form-group small-editor">
-          {{editor system.sureffet target="system.sureffet" button=true owner=owner editable=editable}}
-        </div>
+    </div>
+    <div class="flexcol">
+      <span><label class="alchimie-title">Sur-effet : </label></span>
+      <div class="form-group small-editor">
+        {{editor system.sureffet target="system.sureffet" button=true owner=owner editable=editable}}
       </div>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-recettecuisine-sheet.html b/templates/item-recettecuisine-sheet.html
index 5db2f1f4..4b2a7370 100644
--- a/templates/item-recettecuisine-sheet.html
+++ b/templates/item-recettecuisine-sheet.html
@@ -1,42 +1,34 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label>Niveau</label>
-        <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Durée</label>
-        <input class="attribute-value" type="text" name="system.duree" value="{{system.duree}}" data-dtype="String"/>
-      </div>system
-      <div class="form-group">
-        <label>Sust</label>
-        <input class="attribute-value" type="text" name="system.sust" value="{{system.sust}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Exotisme</label>
-        <input class="attribute-value" type="text" name="system.exotisme" value="{{system.exotisme}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label>Référence / Auteur</label>
-        <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
-      </div>
-      <div class="flexcol">
-        <span><label>Ingrédients : </label></span>
-        <div class="form-group editor">
-          {{editor system.ingredients target="system.ingredients" button=true owner=owner editable=editable}}
-        </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label>Niveau</label>
+      <input class="attribute-value" type="text" name="system.niveau" value="{{system.niveau}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Durée</label>
+      <input class="attribute-value" type="text" name="system.duree" value="{{system.duree}}" data-dtype="String"/>
+    </div>system
+    <div class="form-group">
+      <label>Sust</label>
+      <input class="attribute-value" type="text" name="system.sust" value="{{system.sust}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Exotisme</label>
+      <input class="attribute-value" type="text" name="system.exotisme" value="{{system.exotisme}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label>Référence / Auteur</label>
+      <input class="attribute-value" type="text" name="system.reference" value="{{system.reference}}" data-dtype="String"/>
+    </div>
+    <div class="flexcol">
+      <span><label>Ingrédients : </label></span>
+      <div class="form-group editor">
+        {{editor system.ingredients target="system.ingredients" button=true owner=owner editable=editable}}
       </div>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-rencontresTMR-sheet.html b/templates/item-rencontresTMR-sheet.html
index 66fd689b..7cbaf61a 100644
--- a/templates/item-rencontresTMR-sheet.html
+++ b/templates/item-rencontresTMR-sheet.html
@@ -1,16 +1,7 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-    </section>
-    
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-sort-sheet.html b/templates/item-sort-sheet.html
index 7edd1940..d36c53ce 100644
--- a/templates/item-sort-sheet.html
+++ b/templates/item-sort-sheet.html
@@ -1,82 +1,74 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label>Draconic </label>
-        <select name="system.draconic" id="draconic" data-dtype="String">
-          {{#select system.draconic}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html"}}
-          {{/select}}
-        </select>
-      </div>      
-      <div class="form-group">
-        <label for="xp">Case TMR </label>
-        <select name="system.caseTMR" id="caseTMR" data-dtype="String">
-          {{#select system.caseTMR}}
-          {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
-          <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
-          {{/select}}
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="xp">Case TMR Spéciale </label>
-        <input class="attribute-value" type="text" name="system.caseTMRspeciale" value="{{system.caseTMRspeciale}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Difficulté </label>
-        <input class="attribute-value" type="text" name="system.difficulte" value="{{system.difficulte}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Coût en Rêve </label>
-        <input class="attribute-value" type="text" name="system.ptreve" value="{{system.ptreve}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Coût en Seuil </label>
-        <input class="attribute-value" type="text" name="system.coutseuil" value="{{system.coutseuil}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="rituel">Rituel </label>
-        <input class="attribute-value" type="checkbox" name="system.isrituel"  {{#if system.isrituel}}checked{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Durée </label>
-        <input class="attribute-value" type="text" name="system.duree" value="{{system.duree}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Portée </label>
-        <input class="attribute-value" type="text" name="system.portee" value="{{system.portee}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Cible </label>
-        <input class="attribute-value" type="text" name="system.cible" value="{{system.cible}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Jet de Resistance</label>
-        <input class="attribute-value" type="text" name="system.JR" value="{{system.JR}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">XP </label>
-        <input class="attribute-value" type="text" name="system.xp" value="{{system.xp}}" data-dtype="Number"/>
-      </div>
-      {{#if owner}}
-      {{#each bonusCaseList as |bcData key|}}
-      <div class="form-group">
-        <label for="bonuscase">Case/Bonus :</label>
-        <input class="attribute-value"  type="text" name="caseValue" value="{{bcData.case}}" data-dtype="String"/>
-        <input class="attribute-value" type="text" name="bonusValue" value="{{bcData.bonus}}" data-dtype="Number"/>
-      </div>
-      {{/each}}
-      {{/if}}
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label>Draconic </label>
+      <select name="system.draconic" id="draconic" data-dtype="String">
+        {{#select system.draconic}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/sort-draconic.html"}}
+        {{/select}}
+      </select>
+    </div>      
+    <div class="form-group">
+      <label for="xp">Case TMR </label>
+      <select name="system.caseTMR" id="caseTMR" data-dtype="String">
+        {{#select system.caseTMR}}
+        {{>"systems/foundryvtt-reve-de-dragon/templates/sort-tmr.html"}}
+        <option value="special">Case spéciale TMR (saisie ci-dessous)</option>
+        {{/select}}
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="xp">Case TMR Spéciale </label>
+      <input class="attribute-value" type="text" name="system.caseTMRspeciale" value="{{system.caseTMRspeciale}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Difficulté </label>
+      <input class="attribute-value" type="text" name="system.difficulte" value="{{system.difficulte}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Coût en Rêve </label>
+      <input class="attribute-value" type="text" name="system.ptreve" value="{{system.ptreve}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Coût en Seuil </label>
+      <input class="attribute-value" type="text" name="system.coutseuil" value="{{system.coutseuil}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="rituel">Rituel </label>
+      <input class="attribute-value" type="checkbox" name="system.isrituel"  {{#if system.isrituel}}checked{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Durée </label>
+      <input class="attribute-value" type="text" name="system.duree" value="{{system.duree}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Portée </label>
+      <input class="attribute-value" type="text" name="system.portee" value="{{system.portee}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Cible </label>
+      <input class="attribute-value" type="text" name="system.cible" value="{{system.cible}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Jet de Resistance</label>
+      <input class="attribute-value" type="text" name="system.JR" value="{{system.JR}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">XP </label>
+      <input class="attribute-value" type="text" name="system.xp" value="{{system.xp}}" data-dtype="Number"/>
+    </div>
+    {{#if owner}}
+    {{#each bonusCaseList as |bcData key|}}
+    <div class="form-group">
+      <label for="bonuscase">Case/Bonus :</label>
+      <input class="attribute-value"  type="text" name="caseValue" value="{{bcData.case}}" data-dtype="String"/>
+      <input class="attribute-value" type="text" name="bonusValue" value="{{bcData.bonus}}" data-dtype="Number"/>
+    </div>
+    {{/each}}
+    {{/if}}
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-souffle-sheet.html b/templates/item-souffle-sheet.html
index 086876d8..328f252c 100644
--- a/templates/item-souffle-sheet.html
+++ b/templates/item-souffle-sheet.html
@@ -1,16 +1,8 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+    </section>
 </form>
diff --git a/templates/item-tache-sheet.html b/templates/item-tache-sheet.html
index e0455353..cd64c489 100644
--- a/templates/item-tache-sheet.html
+++ b/templates/item-tache-sheet.html
@@ -1,80 +1,72 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="form-group">
-        <label for="xp">Caractéristique</label>
-        <select name="system.carac" id="caracselect" data-dtype="String">
-        {{#select system.carac}}
-        {{#each caracList  as |carac key|}}
-        <option value="{{key}}">{{carac.label}}</option>
-        {{/each}}
-        {{/select}}    
-        </select>
-      </div>
-      <div class="form-group">
-        <label for="xp">Compétence</label>
-        <select name="system.competence" id="competenceselect" data-dtype="String">
-        {{#select system.competence}}
-        {{#each competences as |competence key|}}
-        <option value="{{competence.name}}">{{competence.name}}</option>
-        {{/each}}
-        {{/select}}    
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="form-group">
+      <label for="xp">Caractéristique</label>
+      <select name="system.carac" id="caracselect" data-dtype="String">
+      {{#select system.carac}}
+      {{#each caracList  as |carac key|}}
+      <option value="{{key}}">{{carac.label}}</option>
+      {{/each}}
+      {{/select}}    
       </select>
     </div>
-      <div class="form-group">
-        <label for="xp">Difficulté</label>
-        <input class="attribute-value" type="text" name="system.difficulte" value="{{system.difficulte}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Périodicité</label>
-        <input class="attribute-value" type="text" name="system.periodicite" value="{{system.periodicite}}" data-dtype="String"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Fatigue</label>
-        <input class="attribute-value" type="text" name="system.fatigue" value="{{system.fatigue}}" data-dtype="Number"/>
-      </div>
-      {{#if isGM}}
-      <div class="form-group">
-        <label for="xp">Cacher les Points de Tâches nécessaires au joueur</label>
-        <input class="attribute-value" type="checkbox" name="system.cacher_points_de_tache" value="{{system.cacher_points_de_tache}}" {{checked system.cacher_points_de_tache}}/>
-      </div>
+    <div class="form-group">
+      <label for="xp">Compétence</label>
+      <select name="system.competence" id="competenceselect" data-dtype="String">
+      {{#select system.competence}}
+      {{#each competences as |competence key|}}
+      <option value="{{competence.name}}">{{competence.name}}</option>
+      {{/each}}
+      {{/select}}    
+    </select>
+  </div>
+    <div class="form-group">
+      <label for="xp">Difficulté</label>
+      <input class="attribute-value" type="text" name="system.difficulte" value="{{system.difficulte}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Périodicité</label>
+      <input class="attribute-value" type="text" name="system.periodicite" value="{{system.periodicite}}" data-dtype="String"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Fatigue</label>
+      <input class="attribute-value" type="text" name="system.fatigue" value="{{system.fatigue}}" data-dtype="Number"/>
+    </div>
+    {{#if isGM}}
+    <div class="form-group">
+      <label for="xp">Cacher les Points de Tâches nécessaires au joueur</label>
+      <input class="attribute-value" type="checkbox" name="system.cacher_points_de_tache" value="{{system.cacher_points_de_tache}}" {{checked system.cacher_points_de_tache}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Points de tâches nécessaires</label>
+      <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
+    </div>
+    {{else}}
       <div class="form-group">
         <label for="xp">Points de tâches nécessaires</label>
+        {{#if system.cacher_points_de_tache}}
+        <input class="attribute-value" type="text" value="?????" data-dtype="Number" disabled/>
+        {{else}}
         <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
+        {{/if}}
       </div>
-      {{else}}
-        <div class="form-group">
-          <label for="xp">Points de tâches nécessaires</label>
-          {{#if system.cacher_points_de_tache}}
-          <input class="attribute-value" type="text" value="?????" data-dtype="Number" disabled/>
-          {{else}}
-          <input class="attribute-value" type="text" name="system.points_de_tache" value="{{system.points_de_tache}}" data-dtype="Number"/>
-          {{/if}}
-        </div>
-      {{/if}}
-      <hr>
-      <div class="form-group">
-        <label for="xp">Points de tâches obtenus</label>
-        <input class="attribute-value" type="text" name="system.points_de_tache_courant" value="{{system.points_de_tache_courant}}" data-dtype="Number"/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Nombre de Succès</label>
-        <input class="attribute-value" type="text" name="system.nb_jet_succes" value="{{system.nb_jet_succes}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
-      </div>
-      <div class="form-group">
-        <label for="xp">Nombre d'Echecs</label>
-        <input class="attribute-value" type="text" name="system.nb_jet_echec" value="{{system.nb_jet_echec}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
-      </div>
+    {{/if}}
+    <hr>
+    <div class="form-group">
+      <label for="xp">Points de tâches obtenus</label>
+      <input class="attribute-value" type="text" name="system.points_de_tache_courant" value="{{system.points_de_tache_courant}}" data-dtype="Number"/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Nombre de Succès</label>
+      <input class="attribute-value" type="text" name="system.nb_jet_succes" value="{{system.nb_jet_succes}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
+    </div>
+    <div class="form-group">
+      <label for="xp">Nombre d'Echecs</label>
+      <input class="attribute-value" type="text" name="system.nb_jet_echec" value="{{system.nb_jet_echec}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
+    </div>
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-      </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>
diff --git a/templates/item-tarot-sheet.html b/templates/item-tarot-sheet.html
index 5e2ab701..3dda13be 100644
--- a/templates/item-tarot-sheet.html
+++ b/templates/item-tarot-sheet.html
@@ -1,29 +1,21 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
-      <div class="flexcol">
-        <div class="form-group">
-          <label>Aspect</label>
-          <input class="attribute-value" type="text" name="system.concept" value="{{system.concept}}" data-dtype="String" />
-        </div>
-        <div class="form-group">
-          <label>Sens</label>
-          <select name="system.aspect" id="aspect" data-dtype="String">
-            {{#select system.aspect}}
-            {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
-            {{/select}}
-          </select>
-        </div>
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+    <div class="flexcol">
+      <div class="form-group">
+        <label>Aspect</label>
+        <input class="attribute-value" type="text" name="system.concept" value="{{system.concept}}" data-dtype="String" />
+      </div>
+      <div class="form-group">
+        <label>Sens</label>
+        <select name="system.aspect" id="aspect" data-dtype="String">
+          {{#select system.aspect}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html"}}
+          {{/select}}
+        </select>
+      </div>
 
-        {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+    </section>
 </form>
diff --git a/templates/item-tete-sheet.html b/templates/item-tete-sheet.html
index 086876d8..63a8c886 100644
--- a/templates/item-tete-sheet.html
+++ b/templates/item-tete-sheet.html
@@ -1,16 +1,8 @@
 <form class="{{cssClass}}" autocomplete="off">
-    <header class="sheet-header">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
-        <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
-        </div>
-    </header>
-    
-    {{!-- Sheet Body --}}
-    <section class="sheet-body">
+  {{>"systems/foundryvtt-reve-de-dragon/templates/header-item.html"}}
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
 
-      {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
-    
-     </section>
-    
+    {{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}
+  </section>
 </form>

From e1ca7ab73819729954be1f3a2ce8fbe5bf79bbbe Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 16 Sep 2022 02:22:09 +0200
Subject: [PATCH 3/4] =?UTF-8?q?Am=C3=A9lioration=20des=20monnaies?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On peut maintenant supprimer es monnaies tant qu'on garde une monnaie
pour chaque valeur de base
---
 module/actor.js        |  1 -
 module/item-monnaie.js | 17 ++++++++++++-----
 module/rdd-utility.js  |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/module/actor.js b/module/actor.js
index 6085a5f9..b4bfe9c4 100644
--- a/module/actor.js
+++ b/module/actor.js
@@ -200,7 +200,6 @@ export class RdDActor extends Actor {
   async checkMonnaiePresence() { // Ajout opportuniste si les pièces n'existent pas.
     if (!this.items) return; // Sanity check during import
     let manquantes = Monnaie.monnaiesManquantes(this.itemTypes['monnaie']);
-    //console.log("Manque : ", manquantes);
     if (manquantes.length > 0) {
       await this.createEmbeddedDocuments('Item', manquantes, { renderSheet: false });
     }
diff --git a/module/item-monnaie.js b/module/item-monnaie.js
index bff8385c..077d4d2a 100644
--- a/module/item-monnaie.js
+++ b/module/item-monnaie.js
@@ -22,12 +22,19 @@ const MONNAIES_STANDARD = [
     system: { quantite: 0, valeur_deniers: 1000, encombrement: 0.004, description: "" }
   }
 ]
+const VALEURS_STANDARDS = MONNAIES_STANDARD.map(it =>it.system.valeur_deniers);
 
 export class Monnaie {
 
-  static isSystemMonnaie(item) {
-    let present = MONNAIES_STANDARD.find(monnaie => monnaie.system.valeur_deniers == item?.system?.valeur_deniers);
-    return present;
+  static isSystemMonnaie(item, items) {
+    if (item.type == 'monnaie')    {
+      const valeur = item.system.valeur_deniers;
+      if (VALEURS_STANDARDS.includes(valeur)) {
+        const monnaiesDeValeur = items.filter(it => it.type == 'monnaie' && it.system.valeur_deniers == valeur)
+        return monnaiesDeValeur.length<=1;
+      }
+    }
+    return false;
   }
 
   static monnaiesData() {
@@ -40,10 +47,10 @@ export class Monnaie {
 
   static monnaiesManquantes(disponibles) {
     const manquantes = MONNAIES_STANDARD.filter(standard => !disponibles.find(disponible => Monnaie.deValeur(disponible, standard.system?.valeur_deniers)));
-    if (manquantes.length>0) {
+    if (manquantes.length > 0) {
       console.error('monnaiesManquantes', manquantes, ' avec monnaies', disponibles, MONNAIES_STANDARD);
     }
-    return []; //manquantes;
+    return manquantes;
   }
 
   static deValeur(monnaie, valeur) {
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 3ceecdac..04bcb0c9 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -861,7 +861,7 @@ export class RdDUtility {
     let itemId = li.data("item-id");
     let objet = actorSheet.actor.getObjet(itemId);
 
-    if (objet.type == 'monnaie' && Monnaie.isSystemMonnaie(objet)) {
+    if (Monnaie.isSystemMonnaie(objet, actorSheet.actor.items)) {
       ui.notifications.warn("Suppression des monnaies de base impossible");
       return;
     }

From c8c13d626c717ffe9d53c8c0c11fe3585d8c5560 Mon Sep 17 00:00:00 2001
From: Vincent Vandemeulebrouck <vincent.vandemeulebrouck@itiviti.com>
Date: Fri, 16 Sep 2022 02:41:54 +0200
Subject: [PATCH 4/4] Fix drop item sans actor

---
 module/rdd-sheet-utility.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/rdd-sheet-utility.js b/module/rdd-sheet-utility.js
index 1289aef1..9f52b7b6 100644
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -26,7 +26,7 @@ export class RdDSheetUtility {
       destId: destItemId,
       targetActorId: actorId,
       itemId: item.id,
-      sourceActorId: item.actor.id,
+      sourceActorId: item.actor?.id,
       srcId: objetVersConteneur[item.id],
       onEnleverConteneur: () => { delete objetVersConteneur[item.id]; },
       onAjouterDansConteneur: (itemId, conteneurId) => { objetVersConteneur[itemId] = conteneurId; }