diff --git a/module/item.js b/module/item.js index 21db5b80..26b0fb7e 100644 --- a/module/item.js +++ b/module/item.js @@ -195,9 +195,15 @@ export class RdDItem extends Item { if (itemData.name != otherData.name) return false; if (tplData.quantite == undefined) return false; - for (const [key, value] of Object.entries(tplData)) { - if (['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key)) continue; - if (value != otherTplData[key]) return false; + const differences = Object.entries(tplData).filter(([key, value]) => !['quantite', 'encTotal', 'prixTotal', 'cout'].includes(key)) + .filter(([key, value]) => value != otherTplData[key]); + if (differences.length > 0) { + let message = `Impossible de regrouper les ${itemData.type} ${itemData.name}: `; + for (const [key, value] of differences){ + message += `
${key}: ${value} vs ${otherTplData[key]}`; + } + ui.notifications.info(message) + return false; } return true; }