From a44dcdb5625e9283dbfcae42c5ed65fd10a0260b Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Sun, 25 Sep 2022 22:57:35 +0200 Subject: [PATCH] Use isModEnabled --- htdocs/product/reassort.php | 2 +- htdocs/product/stock/product.php | 2 +- htdocs/product/stock/replenish.php | 4 ++-- htdocs/projet/element.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 0da084d1f39..ed7b7e3e77f 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -91,7 +91,7 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) - || !empty($conf->mrp->enabled)) { + || isModEnabled('mrp')) { $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs. } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index bd679a3f2d8..c7503bb957f 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -821,7 +821,7 @@ if ($id > 0 || $ref) { } // Number of product in production - if (!empty($conf->mrp->enabled)) { + if (isModEnabled('mrp')) { if ($found) { $helpondiff .= '
'; } else { diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php index 291fb2b7333..6ec5c1d0b9b 100644 --- a/htdocs/product/stock/replenish.php +++ b/htdocs/product/stock/replenish.php @@ -111,7 +111,7 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) - || !empty($conf->mrp->enabled)) { + || isModEnabled('mrp')) { $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs. } @@ -459,7 +459,7 @@ if ($usevirtualstock) { $sqlReceptionFourn = '0'; } - if (!empty($conf->mrp->enabled)) { + if (isModEnabled('mrp')) { $sqlProductionToConsume = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL $sqlProductionToConsume .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,"; $sqlProductionToConsume .= " ".MAIN_DB_PREFIX."mrp_production as mp5"; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 032677c27d8..01ffe38cc0d 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -99,7 +99,7 @@ if (!empty($conf->salaries->enabled)) { if (isModEnabled('categorie')) { require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php'; } -if (!empty($conf->mrp->enabled)) { +if (isModEnabled('mrp')) { require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php'; } @@ -132,7 +132,7 @@ if (!empty($conf->loan->enabled)) { if (!empty($conf->salaries->enabled)) { $langs->load("salaries"); } -if (!empty($conf->mrp->enabled)) { +if (isModEnabled('mrp')) { $langs->load("mrp"); } if (isModEnabled('eventorganization')) {