From d0cc072a5855c4058bb28b40c7389ae404ee1631 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 23 Feb 2015 06:49:11 +0100 Subject: [PATCH] Module Expense Report: reactivate conflictwith modDeplacement --- htdocs/core/modules/modExpenseReport.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index c82de294008..c03647993eb 100755 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -84,7 +84,7 @@ class modExpenseReport extends DolibarrModules // Dependencies $this->depends = array(); // List of modules id that must be enabled if this module is enabled -// $this->conflictwith = array("modDeplacement"); + $this->conflictwith = array("modDeplacement"); $this->requiredby = array(); // List of modules id to disable if this one is disabled $this->phpmin = array(4,3); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,7); // Minimum version of Dolibarr required by module