';
print '';
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
print $form->textwithpicto($langs->trans('AvailabilityPeriod'), $langs->trans('AvailabilityPeriod').' ('.$langs->trans('AfterOrder').')');
} else {
print $langs->trans('AvailabilityPeriod');
@@ -2826,7 +2826,7 @@ if ($action == 'create') {
}
// Create a sale order
- if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
+ if (isModEnabled('commande') && $object->statut == Propal::STATUS_SIGNED) {
if ($usercancreateorder) {
print ''.$langs->trans("AddOrder").' ';
}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index b97bf147dbb..c5b00c3c41e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -71,7 +71,7 @@ if (!empty($conf->incoterm->enabled)) {
if (!empty($conf->margin->enabled)) {
$langs->load('margins');
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load('productbatch');
}
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 57f61f3d9f7..9ee103911f7 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -92,7 +92,7 @@ if ($tmp) {
/*
* Draft orders
*/
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
$sql .= ", s.client";
$sql .= ", s.code_client";
@@ -244,7 +244,7 @@ $max = 10;
/*
* Orders to process
*/
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
$sql .= ", s.client";
$sql .= ", s.code_client";
@@ -333,7 +333,7 @@ if (!empty($conf->commande->enabled)) {
/*
* Orders that are in process
*/
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
$sql .= ", s.client";
$sql .= ", s.code_client";
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 4ba2f410cc9..84dafaba2e8 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -2389,7 +2389,7 @@ if ($resql) {
$stock_order = 0;
$stock_order_supplier = 0;
if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) { // What about other options ?
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
$generic_product->load_stats_commande(0, '1,2');
$productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'] = $generic_product->stats_commande['qty'];
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 839a61b2413..f9c6f4edd3e 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2321,7 +2321,7 @@ if (empty($reshook)) {
if (!$error) {
// Add batchinfo if the detail_batch array is defined
- if (!empty($conf->productbatch->enabled) && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
+ if (isModEnabled('productbatch') && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
$langs->load('productbatch');
foreach ($lines[$i]->detail_batch as $batchline) {
$desc .= ' '.$langs->trans('Batch').' '.$batchline->batch.' '.$langs->trans('printQty', $batchline->qty).' ';
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 2c7ac145b78..a0834139bd2 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -191,7 +191,7 @@ abstract class ActionsContactCardCommon
$this->object->load_ref_elements();
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
$i++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index ff7c0051a29..d3b050e5e0b 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1225,7 +1225,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
$object->load_ref_elements();
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
print ' '.$langs->trans("ContactForOrders").' ';
print $object->ref_commande ? $object->ref_commande : (''.$langs->trans("NoContactForAnyOrder").' ');
print ' ';
if (isModEnabled("expedition")) {
print $langs->trans("ContactForOrdersOrShipments");
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index fff1ba17644..569a155cc99 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -159,7 +159,7 @@ if ($object->thirdparty->client) {
if (isModEnabled("propal") && $user->rights->propal->lire) {
$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
}
- if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ if (isModEnabled('commande') && $user->rights->commande->lire) {
$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
}
if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 439f312bef6..564122f3137 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2116,7 +2116,7 @@ if ($action == 'create') {
}
}
- if (!empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
+ if (isModEnabled('commande') && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
$langs->load("orders");
if ($user->rights->commande->creer) {
print dolGetButtonAction($langs->trans('CreateOrder'), '', 'default', DOL_URL_ROOT.'/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id, '', true, $params);
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 12656518efc..20c2e814d82 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -189,7 +189,7 @@ class box_activity extends ModeleBoxes
}
// list the summary of the orders
- if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ if (isModEnabled('commande') && $user->rights->commande->lire) {
include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
$commandestatic = new Commande($this->db);
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 42a77f14b9c..92a8b471e5f 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -214,7 +214,7 @@ class box_graph_product_distribution extends ModeleBoxes
}
}
- if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
+ if (isModEnabled('commande') && !empty($user->rights->commande->lire)) {
// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
if ($showordernb) {
$langs->load("orders");
@@ -369,7 +369,7 @@ class box_graph_product_distribution extends ModeleBoxes
$stringtoshow .= ' '.$langs->trans("FollowingUrlAreAvailableToMakePayments").': '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':'.getOnlinePaymentUrl(1, 'free')."
';
print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).': '.getOnlinePaymentUrl(1, 'order')."
';
print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).': '.getOnlinePaymentUrl(1, 'membersubscription')." '.$langs->trans("RefOrder").' ';
$order = new Commande($db);
$order->fetch($expedition->origin_id);
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 9af06f87541..55f6293a9d2 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
if (isModEnabled("propal")) {
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
}
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index c37ce4690f4..c7a4a570a5c 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -322,7 +322,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
if (!empty($conf->contrat->enabled)) {
$rowspan++; $sectionauto[] = array('position'=>40, 'level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
}
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
$rowspan++; $sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
}
if (isModEnabled('facture')) {
@@ -338,7 +338,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
if (isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_invoice")) {
$rowspan++; $sectionauto[] = array('position'=>90, 'level'=>1, 'module'=>'invoice_supplier', 'test'=>(isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || isModEnabled("supplier_invoice")), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
}
- if (!empty($conf->tax->enabled)) {
+ if (isModEnabled('tax')) {
$langs->load("compta");
$rowspan++; $sectionauto[] = array('position'=>100, 'level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
$rowspan++; $sectionauto[] = array('position'=>110, 'level'=>1, 'module'=>'tax-vat', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("VAT"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("VAT")));
@@ -355,7 +355,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
$langs->load("interventions");
$rowspan++; $sectionauto[] = array('position'=>150, 'level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
}
- if (!empty($conf->expensereport->enabled)) {
+ if (isModEnabled('expensereport')) {
$langs->load("trips");
$rowspan++; $sectionauto[] = array('position'=>160, 'level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
}
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 7572dd3f3d8..ac986ad00f4 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -125,7 +125,7 @@ if (isModEnabled("propal")) {
if (!empty($conf->contrat->enabled)) {
$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
}
if (isModEnabled('facture')) {
@@ -140,7 +140,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")) {
$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_invoice")), 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
}
-if (!empty($conf->tax->enabled)) {
+if (isModEnabled('tax')) {
$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
}
if (!empty($conf->project->enabled)) {
@@ -149,7 +149,7 @@ if (!empty($conf->project->enabled)) {
if (!empty($conf->ficheinter->enabled)) {
$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
}
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
}
if (isModEnabled('holiday')) {
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3a0a9869571..333c93fdfd7 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -53,7 +53,7 @@ if (isModEnabled("product") || isModEnabled("service")) {
if (isModEnabled("propal")) {
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
}
if (!empty($conf->project->enabled)) {
@@ -67,7 +67,7 @@ $langs->loadLangs(array("sendings", "companies", "bills", 'deliveries', 'orders'
if (!empty($conf->incoterm->enabled)) {
$langs->load('incoterm');
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load('productbatch');
}
@@ -258,7 +258,7 @@ if (empty($reshook)) {
$stockLocation = "ent1".$i."_0";
$qty = "qtyl".$i;
- if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch) { // If product need a batch number
+ if (isModEnabled('productbatch') && $objectsrc->lines[$i]->product_tobatch) { // If product need a batch number
if (GETPOSTISSET($batch)) {
//shipment line with batch-enable product
$qty .= '_'.$j;
@@ -875,7 +875,7 @@ if ($action == 'create') {
// Ref
print '';
- if ($origin == 'commande' && !empty($conf->commande->enabled)) {
+ if ($origin == 'commande' && isModEnabled('commande')) {
print $langs->trans("RefOrder");
}
if ($origin == 'propal' && isModEnabled("propal")) {
@@ -1033,7 +1033,7 @@ if ($action == 'create') {
$i = 0;
while ($i < $numAsked) {
print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
}
$i++;
@@ -1552,7 +1552,7 @@ if ($action == 'create') {
if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
$disabled = '';
- if (!empty($conf->productbatch->enabled) && $product->hasbatch()) {
+ if (isModEnabled('productbatch') && $product->hasbatch()) {
$disabled = 'disabled="disabled"';
}
if ($warehouse_selected_id <= 0) { // We did not force a given warehouse, so we won't have no warehouse to change qty.
@@ -1714,7 +1714,7 @@ if ($action == 'create') {
$totalVolume = $tmparray['volume'];
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
$objectsrc = new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
}
@@ -1779,7 +1779,7 @@ if ($action == 'create') {
print '';
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
print '';
print $langs->trans("RefOrder").' ';
print '';
@@ -2048,7 +2048,7 @@ if ($action == 'create') {
if (!empty($conf->stock->enabled)) {
print $langs->trans("WarehouseSource").' - ';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print $langs->trans("Batch");
}
print ' ';
@@ -2062,7 +2062,7 @@ if ($action == 'create') {
print ''.$langs->trans("WarehouseSource").' ';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("Batch").' ';
}
}
@@ -2358,7 +2358,7 @@ if ($action == 'create') {
}
// Batch number managment
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if (isset($lines[$i]->detail_batch)) {
print '';
print '';
@@ -2437,7 +2437,7 @@ if ($action == 'create') {
if ($origin && $origin_id > 0) {
$colspan++;
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$colspan++;
}
if (!empty($conf->stock->enabled)) {
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index ec7d7ff3cab..b1a767e197d 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -965,7 +965,7 @@ class Expedition extends CommonObject
}
// If product need a batch number, we should not have called this function but addline_batch instead.
- if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
+ if (isModEnabled('productbatch') && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
return -4;
}
@@ -1716,7 +1716,7 @@ class Expedition extends CommonObject
}
// Detail of batch
- if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0) {
+ if (isModEnabled('productbatch') && $obj->line_id > 0 && $obj->product_tobatch > 0) {
$newdetailbatch = $shipmentlinebatch->fetchAll($obj->line_id, $obj->fk_product);
if (is_array($newdetailbatch)) {
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 112d35a63aa..cdf6a982054 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -53,7 +53,7 @@ if ($id > 0 || !empty($ref)) {
}
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
$objectsrc = new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
}
@@ -196,7 +196,7 @@ if ($id > 0 || !empty($ref)) {
print '';
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
print '';
$objectsrc = new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c8fc0ff35be..a6a6a1b0e3b 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -51,7 +51,7 @@ if ($id > 0 || !empty($ref)) {
}
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
$objectsrc = new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
}
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 7234e54e8f1..9d5c5b70fe4 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
}
if (!empty($conf->categorie->enabled)) {
@@ -353,7 +353,7 @@ if ($object->id > 0) {
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
// Module Adherent
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$langs->load("members");
$langs->load("users");
print ' '.$langs->trans("LinkedToDolibarrMember").' ';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index c794a227afa..b90b03a06cb 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -36,7 +36,7 @@
require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
}
require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index cbf961b8ff9..25b26c75852 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1173,7 +1173,7 @@ class ProductFournisseur extends Product
$label .= ''.$langs->trans('RefSupplier').': '.$this->ref_supplier;
if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$langs->load("productbatch");
$label .= "".$langs->trans("ManageLotSerial").' : '.$this->getLibStatut(0, 2);
}
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 2f0f7966679..c7baf022d8e 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -46,7 +46,7 @@ if (!empty($conf->project->enabled)) {
// Load translation files required by the page
$langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load('productbatch');
}
@@ -721,7 +721,7 @@ if ($id > 0 || !empty($ref)) {
print '';
print ''.$langs->trans("Description").' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("batch_number").' ';
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.$langs->trans("SellByDate").' ';
@@ -820,7 +820,7 @@ if ($id > 0 || !empty($ref)) {
$linktoprod = $tmpproduct->getNomUrl(1);
$linktoprod .= ' - '.$objp->label."\n";
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if ($objp->tobatch) {
// Product
print '';
@@ -869,7 +869,7 @@ if ($id > 0 || !empty($ref)) {
// Already dispatched
print ' '.$products_dispatched[$objp->rowid].' ';
- if (!empty($conf->productbatch->enabled) && $objp->tobatch > 0) {
+ if (isModEnabled('productbatch') && $objp->tobatch > 0) {
$type = 'batch';
print '';
print ' '; // Qty to dispatch
@@ -981,7 +981,7 @@ if ($id > 0 || !empty($ref)) {
print '';
print '';
- if (!empty($conf->productbatch->enabled) && $objp->tobatch > 0) {
+ if (isModEnabled('productbatch') && $objp->tobatch > 0) {
$type = 'batch';
print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"');
} else {
@@ -1162,7 +1162,7 @@ if ($id > 0 || !empty($ref)) {
print ' '.$langs->trans("Product").' ';
print ''.$langs->trans("DateCreation").' ';
print ''.$langs->trans("DateDeliveryPlanned").' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("batch_number").' ';
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.$langs->trans("SellByDate").' ';
@@ -1227,7 +1227,7 @@ if ($id > 0 || !empty($ref)) {
print ''.dol_print_date($db->jdate($objp->datec), 'day').' ';
print ''.dol_print_date($db->jdate($objp->date_delivery), 'day').' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if ($objp->batch) {
include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
$lot = new Productlot($db);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index dfa47df91a3..a86783db2d3 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -37,10 +37,10 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
}
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
}
if (!empty($conf->recruitment->enabled)) {
@@ -116,11 +116,11 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) { // This is usel
$langs->load("holiday");
$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
}
- if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire) {
+ if (isModEnabled('deplacement') && $user->rights->deplacement->lire) {
$langs->load("trips");
$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
}
- if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) {
+ if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
$langs->load("trips");
$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
}
@@ -270,7 +270,7 @@ if (isModEnabled('holiday') && $user->rights->holiday->read) {
// Latest expense report
-if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire) {
+if (isModEnabled('expensereport') && $user->rights->expensereport->lire) {
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.statut as user_status, u.photo,";
$sql .= " x.rowid, x.ref, x.date_debut as date, x.tms as dm, x.total_ttc, x.fk_statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as x, ".MAIN_DB_PREFIX."user as u";
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index a7216b6ad72..02b3ce48ca4 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -2024,7 +2024,7 @@ function migrate_modeles($db, $langs, $conf)
}
}
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
$modellist = ModelePDFCommandes::liste_modeles($db);
if (count($modellist) == 0) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6a0fda06cb0..989e856b690 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2432,7 +2432,7 @@ function printDropdownQuickadd()
"title" => "MenuNewMember@members",
"name" => "Adherent@members",
"picto" => "object_member",
- "activation" => !empty($conf->adherent->enabled) && $user->hasRight("adherent", "write"), // vs hooking
+ "activation" => isModEnabled('adherent') && $user->hasRight("adherent", "write"), // vs hooking
"position" => 5,
),
array(
@@ -2465,7 +2465,7 @@ function printDropdownQuickadd()
"title" => "NewOrder@orders",
"name" => "Order@orders",
"picto" => "object_order",
- "activation" => !empty($conf->commande->enabled) && $user->hasRight("commande", "write"), // vs hooking
+ "activation" => isModEnabled('commande') && $user->hasRight("commande", "write"), // vs hooking
"position" => 40,
),
array(
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 1384852ace8..19533e05c06 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -119,9 +119,9 @@ $arrayfields = array(
'm.datem'=>array('label'=>"Date", 'checked'=>1, 'position'=>2),
'p.ref'=>array('label'=>"ProductRef", 'checked'=>1, 'css'=>'maxwidth100', 'position'=>3),
'p.label'=>array('label'=>"ProductLabel", 'checked'=>0, 'position'=>5),
- 'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+ 'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 0f734df6ae9..88788da8b43 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -278,7 +278,7 @@ if (empty($reshook)) {
setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Warehouse"), $tmpproduct->ref), null, 'errors');
$error++;
}
- if (!empty($conf->productbatch->enabled) && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
+ if (isModEnabled('productbatch') && $tmpproduct->status_batch && (!GETPOST('batchtoproduce-'.$line->id.'-'.$i))) {
$langs->load("errors");
setEventMessages($langs->trans("ErrorFieldRequiredForProduct", $langs->transnoentitiesnoconv("Batch"), $tmpproduct->ref), null, 'errors');
$error++;
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 5f0159ce567..d9b943fb40f 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -62,7 +62,7 @@ if (isModEnabled("propal")) {
if (isModEnabled('facture')) {
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
}
if (!empty($conf->accounting->enabled)) {
@@ -82,7 +82,7 @@ if (!empty($conf->stock->enabled)) {
if (isModEnabled('facture')) {
$langs->load("bills");
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -1353,7 +1353,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print ' ';
// Batch number management
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("ManageLotSerial").' ';
$statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"), '2' => $langs->trans("ProductStatusOnSerial"));
print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));
@@ -2368,7 +2368,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
}
// Batch number management (to batch)
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
print ' '.$langs->trans("ManageLotSerial").' ';
print $object->getLibStatut(0, 2);
@@ -2823,7 +2823,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
}
// Commande
- if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
+ if (isModEnabled('commande') && $user->rights->commande->creer) {
$commande = new Commande($db);
$langs->load("orders");
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 1a157ed9171..360709dc5a0 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -4943,7 +4943,7 @@ class Product extends CommonObject
$label .= ''.$langs->trans('ProductLabel').': '.$this->label;
}
if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$langs->load("productbatch");
$label .= "".$langs->trans("ManageLotSerial").' : '.$this->getLibStatut(0, 2);
}
@@ -5141,7 +5141,7 @@ class Product extends CommonObject
$labelStatus = $labelStatusShort = '';
$langs->load('products');
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -5456,7 +5456,7 @@ class Product extends CommonObject
//dol_syslog("load_virtual_stock");
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
$result = $this->load_stats_commande(0, '1,2', 1);
if ($result < 0) {
dol_print_error($this->db, $this->error);
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index f7b3ddd5ac6..c1ef43c5c02 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -348,7 +348,7 @@ if (empty($reshook)) {
$error++;
setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
}
- if (!$error && !empty($conf->productbatch->enabled)) {
+ if (!$error && isModEnabled('productbatch')) {
$tmpproduct = new Product($db);
$result = $tmpproduct->fetch($fk_product);
@@ -608,7 +608,7 @@ if ($object->id > 0) {
if (!empty($conf->use_javascript_ajax)) {
if ($permissiontoadd) {
// Link to launch scan tool
- if (isModEnabled('barcode') || !empty($conf->productbatch->enabled)) {
+ if (isModEnabled('barcode') || isModEnabled('productbatch')) {
print ''.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").' ';
}
@@ -906,7 +906,7 @@ if ($object->id > 0) {
print ' ';
print ''.$langs->trans("Warehouse").' ';
print ''.$langs->trans("Product").' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print '';
print $langs->trans("Batch");
print ' ';
@@ -944,7 +944,7 @@ if ($object->id > 0) {
print '';
print $form->select_produits((GETPOSTISSET('fk_product') ? GETPOST('fk_product', 'int') : $object->fk_product), 'fk_product', '', 0, 0, -1, 2, '', 0, null, 0, '1', 0, 'maxwidth300');
print ' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print '';
print ' ';
@@ -1022,7 +1022,7 @@ if ($object->id > 0) {
print $product_static->getNomUrl(1).' - '.$product_static->label;
print '';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print '';
$batch_static = new Productlot($db);
$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
@@ -1039,7 +1039,7 @@ if ($object->id > 0) {
$valuetoshow = $obj->qty_stock;
// For inventory not yet close, we overwrite with the real value in stock now
if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
- if (!empty($conf->productbatch->enabled) && $product_static->hasbatch()) {
+ if (isModEnabled('productbatch') && $product_static->hasbatch()) {
$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->detail_batch[$obj->batch]->qty;
} else {
$valuetoshow = $product_static->stock_warehouse[$obj->fk_warehouse]->real;
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 38c3c0c80ea..dcea4f4b8f7 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -49,7 +49,7 @@ if (!empty($conf->categorie->enabled)) {
// Load translation files required by the page
$langs->loadLangs(array('products', 'stocks', 'suppliers', 'companies', 'margins'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -238,7 +238,7 @@ $arrayfields = array(
'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>51),
'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>52),
'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $virtualdiffersfromphysical), 'position'=>53),
- 'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
+ 'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(isModEnabled('productbatch')), 'position'=>60),
'p.fk_country'=>array('label'=>"Country", 'checked'=>0, 'position'=>100),
'p.fk_state'=>array('label'=>"State", 'checked'=>0, 'position'=>101),
$alias_product_perentity . '.accountancy_code_sell'=>array('label'=>"ProductAccountancySellCode", 'checked'=>0, 'enabled'=>empty($conf->global->PRODUCT_DISABLE_ACCOUNTING), 'position'=>400),
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index 5653a564b9e..8edb3be32da 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -272,7 +272,7 @@ class MouvementStock extends CommonObject
}
// Test if product require batch data. If yes, and there is not or values are not correct, we throw an error.
- if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+ if (isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
if (empty($batch)) {
$langs->load("errors");
$this->errors[] = $langs->transnoentitiesnoconv("ErrorTryToMakeMoveOnProductRequiringBatchData", $product->ref);
@@ -384,7 +384,7 @@ class MouvementStock extends CommonObject
// Check if stock is enough when qty is < 0
// Note that qty should be > 0 with type 0 or 3, < 0 with type 1 or 2.
if ($movestock && $qty < 0 && empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER)) {
- if (!empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+ if (isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
$foundforbatch = 0;
$qtyisnotenough = 0;
@@ -544,7 +544,7 @@ class MouvementStock extends CommonObject
}
// Update detail of stock for the lot.
- if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+ if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
if ($id_product_batch > 0) {
$result = $this->createBatch($id_product_batch, $qty);
} else {
@@ -596,7 +596,7 @@ class MouvementStock extends CommonObject
// End call triggers
// Check unicity for serial numbered equipments once all movement were done.
- if (!$error && !empty($conf->productbatch->enabled) && $product->hasbatch() && !$skip_batch) {
+ if (!$error && isModEnabled('productbatch') && $product->hasbatch() && !$skip_batch) {
if ($product->status_batch == 2 && $qty > 0) { // We check only if we increased qty
if ($this->getBatchCount($fk_product, $batch) > 1) {
$error++;
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 6efe9f0d9e8..0f9deb92772 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -164,7 +164,7 @@ if ($resql) {
print " ";
print ''.$langs->trans("LastMovements", min($num, $max)).' ';
print ''.$langs->trans("Product").' ';
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("Batch").' ';
/*if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.$langs->trans("SellByDate").' ';
@@ -204,7 +204,7 @@ if ($resql) {
print '';
print $producttmp->getNomUrl(1);
print " \n";
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print '';
print $tmplotstatic->getNomUrl(0, 'nolink');
print ' ';
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index 32c95537947..c31bbbc3101 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -44,7 +44,7 @@ if (!empty($conf->project->enabled)) {
// Load translation files required by the page
$langs->loadLangs(array('products', 'stocks', 'orders'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -106,9 +106,9 @@ $arrayfields = array(
'm.datem'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
'p.ref'=>array('label'=>$langs->trans("ProductRef"), 'checked'=>1, 'css'=>'maxwidth100'),
'p.label'=>array('label'=>$langs->trans("ProductLabel"), 'checked'=>1),
- 'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+ 'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
@@ -273,7 +273,7 @@ if ($action == "transfert_stock" && !$cancel) {
$action = 'transfert';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$product = new Product($db);
$result = $product->fetch($product_id);
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 9f097e1c4e3..d2639000270 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -45,7 +45,7 @@ if (!empty($conf->project->enabled)) {
// Load translation files required by the page
$langs->loadLangs(array('products', 'stocks', 'orders'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -125,9 +125,9 @@ $arrayfields = array(
'm.datem'=>array('label'=>"Date", 'checked'=>1, 'position'=>2),
'p.ref'=>array('label'=>"ProductRef", 'checked'=>1, 'css'=>'maxwidth100', 'position'=>3),
'p.label'=>array('label'=>"ProductLabel", 'checked'=>0, 'position'=>5),
- 'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
- 'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
+ 'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(isModEnabled('productbatch'))),
+ 'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(isModEnabled('productbatch'))),
'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
@@ -448,7 +448,7 @@ if ($action == "transfert_stock" && !$cancel) {
$action = 'transfert';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$product = new Product($db);
$result = $product->fetch($product_id);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 51b12d4a6b1..ca3624fe147 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.php';
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
}
if (!empty($conf->project->enabled)) {
@@ -56,7 +56,7 @@ if (!empty($conf->variants->enabled)) {
// Load translation files required by the page
$langs->loadlangs(array('products', 'suppliers', 'orders', 'bills', 'stocks', 'sendings', 'margins'));
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load("productbatch");
}
@@ -248,7 +248,7 @@ if ($action == "correct_stock" && !$cancel) {
$action = 'correction';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$object = new Product($db);
$result = $object->fetch($id);
@@ -345,7 +345,7 @@ if ($action == "transfert_stock" && !$cancel) {
$error++;
$action = 'transfert';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$object = new Product($db);
$result = $object->fetch($id);
@@ -761,7 +761,7 @@ if ($id > 0 || $ref) {
$found = 0;
$helpondiff = ''.$langs->trans("StockDiffPhysicTeoric").': ';
- if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
+ if ((isModEnabled('productbatch')) && $object->hasbatch()) {
$colspan = 3;
print '';
if (!empty($conf->use_javascript_ajax)) {
@@ -1029,7 +1029,7 @@ if (!$variants) {
// Warehouse
print ' ';
print $entrepotstatic->getNomUrl(1);
- if (!empty($conf->use_javascript_ajax) && !empty($conf->productbatch->enabled) && $object->hasbatch()) {
+ if (!empty($conf->use_javascript_ajax) && isModEnabled('productbatch') && $object->hasbatch()) {
print '';
print (empty($conf->global->STOCK_SHOW_ALL_BATCH_BY_DEFAULT) ? '(+)' : '(-)');
print ' ';
@@ -1096,7 +1096,7 @@ if (!$variants) {
$totalvalue = $totalvalue + ($object->pmp * $obj->reel);
$totalvaluesell = $totalvaluesell + ($object->price * $obj->reel);
// Batch Detail
- if ((!empty($conf->productbatch->enabled)) && $object->hasbatch()) {
+ if ((isModEnabled('productbatch')) && $object->hasbatch()) {
$details = Productbatch::findAll($db, $obj->product_stock_id, 0, $object->id);
if ($details < 0) {
dol_print_error($db);
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 89ba063e8d7..842aa83bd07 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -85,7 +85,7 @@ if ($id || $ref) {
$object->fetch($id, $productid, $batch);
$object->ref = $object->batch; // Old system for document management ( it uses $object->ref)
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
$filearray = dol_dir_list($upload_dir, "files");
if (empty($filearray)) {
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index f2821eab8ce..1eb8a444d8a 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -413,7 +413,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
$sql .= ', s.fk_product';
if ($usevirtualstock) {
- if (!empty($conf->commande->enabled)) {
+ if (isModEnabled('commande')) {
$sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd1.qty) IS NULL", "0", "SUM(cd1.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL
$sqlCommandesCli .= " FROM ".MAIN_DB_PREFIX."commandedet as cd1, ".MAIN_DB_PREFIX."commande as c1";
$sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity(!empty($conf->global->STOCK_CALCULATE_VIRTUAL_STOCK_TRANSVERSE_MODE) ? 'stock' : 'commande').")";
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index f2ecfa1d73c..819fa404d52 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -93,7 +93,7 @@ print ' '.$langs->trans("NumberOfUnit").' ';
// Serial / Eat-by date
-if (!empty($conf->productbatch->enabled) &&
+if (isModEnabled('productbatch') &&
(($object->element == 'product' && $object->hasbatch())
|| ($object->element == 'stock'))
) {
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 246ae6b7ba8..bc182efa3f2 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1348,7 +1348,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
$langs->load("propal");
print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true));
}
- if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
+ if (isModEnabled('commande') && $user->rights->commande->creer) {
$langs->load("orders");
print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true));
}
@@ -1376,7 +1376,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
$langs->load("contracts");
print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true));
}
- if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
+ if (isModEnabled('expensereport') && $user->rights->expensereport->creer) {
$langs->load("trips");
print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid, '', 1, array('isDropDown' => true));
}
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index a96ba8c2819..57583a538fb 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -46,7 +46,7 @@ if (isModEnabled('facture')) {
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
}
if (!empty($conf->supplier_proposal->enabled)) {
@@ -67,10 +67,10 @@ if (!empty($conf->ficheinter->enabled)) {
if (isModEnabled("expedition")) {
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
}
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
}
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
}
if (isModEnabled('agenda')) {
@@ -86,7 +86,7 @@ if (!empty($conf->loan->enabled)) {
if (!empty($conf->stock->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
}
-if (!empty($conf->tax->enabled)) {
+if (isModEnabled('tax')) {
require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
}
if (isModEnabled("banque")) {
@@ -107,7 +107,7 @@ $langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
if (isModEnabled('facture')) {
$langs->load("bills");
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
$langs->load("orders");
}
if (isModEnabled("propal")) {
@@ -116,10 +116,10 @@ if (isModEnabled("propal")) {
if (!empty($conf->ficheinter->enabled)) {
$langs->load("interventions");
}
-if (!empty($conf->deplacement->enabled)) {
+if (isModEnabled('deplacement')) {
$langs->load("trips");
}
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
$langs->load("trips");
}
if (!empty($conf->don->enabled)) {
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index e3532fb6471..8964cca8c19 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -109,7 +109,7 @@ if ($id > 0 || !empty($ref)) {
}
$object->info($object->id);
}
-$agenda = (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
+$agenda = (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) ? '/'.$langs->trans("Agenda") : '';
$title = $langs->trans('Events').$agenda.' - '.$object->ref.' '.$object->name;
if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 00f534a388c..6ca72ea2d97 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -54,7 +54,7 @@ if ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMO
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
}
if (!empty($conf->project->enabled)) {
@@ -67,7 +67,7 @@ $langs->loadLangs(array("receptions", "companies", "bills", 'deliveries', 'order
if (!empty($conf->incoterm->enabled)) {
$langs->load('incoterm');
}
-if (!empty($conf->productbatch->enabled)) {
+if (isModEnabled('productbatch')) {
$langs->load('productbatch');
}
@@ -626,7 +626,7 @@ if (empty($reshook)) {
$line->qty = GETPOST($qty, 'int');
$line->comment = GETPOST($comment, 'alpha');
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$batch = "batch".$line_id;
$dlc = "dlc".$line_id;
$dluo = "dluo".$line_id;
@@ -1041,7 +1041,7 @@ if ($action == 'create') {
if (!empty($conf->stock->enabled)) {
print ' '.$langs->trans("Warehouse").' ('.$langs->trans("Stock").') ';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("batch_number").' ';
if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.$langs->trans("SellByDate").' ';
@@ -1216,7 +1216,7 @@ if ($action == 'create') {
print '';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if (!empty($product->status_batch)) {
print '';
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
print '';
print $langs->trans("RefOrder").' ';
print '';
@@ -1700,7 +1700,7 @@ if ($action == 'create') {
if (!empty($conf->stock->enabled)) {
print $langs->trans("WarehouseSource").' - ';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print $langs->trans("Batch");
}
print ' ';
@@ -1721,7 +1721,7 @@ if ($action == 'create') {
print ''.$langs->trans("WarehouseSource").' ';
}
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
print ''.$langs->trans("Batch").' ';
}
}
@@ -1957,7 +1957,7 @@ if ($action == 'create') {
}
// Batch number managment
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
if (isset($lines[$i]->batch)) {
print '';
print '';
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index ceb71624292..85071a49b94 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
if (isModEnabled("propal")) {
require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
}
-if (!empty($conf->commande->enabled)) {
+if (isModEnabled('commande')) {
require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
}
@@ -849,7 +849,7 @@ class Reception extends CommonObject
// Check batch is set
$product = new Product($this->db);
$product->fetch($fk_product);
- if (!empty($conf->productbatch->enabled)) {
+ if (isModEnabled('productbatch')) {
$langs->load("errors");
if (!empty($product->status_batch) && empty($batch)) {
$this->error = $langs->trans('ErrorProductNeedBatchNumber', $product->ref);
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index fadf222aa3e..cb2c84ebd76 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -51,7 +51,7 @@ if ($id > 0 || !empty($ref)) {
}
// Linked documents
- if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
+ if ($typeobject == 'commande' && $object->$typeobject->id && isModEnabled('commande')) {
$objectsrc = new Commande($db);
$objectsrc->fetch($object->$typeobject->id);
}
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 5a26946913c..e71ee255981 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -342,7 +342,7 @@ abstract class ActionsCardCommon
}
// Linked member
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$langs->load("members");
$adh = new Adherent($this->db);
$result = $adh->fetch('', '', $this->object->id);
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 0c6f2caf1e1..d1ba18f82fd 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -247,7 +247,7 @@ for ($i = 1; $i <= 4; $i++) {
control->tpl['sales_representatives']; ?>
trans("LinkedToDolibarrMember"); ?>
control->tpl['linked_member']; ?>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index bfbf6271711..98979c917d4 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -174,7 +174,7 @@ if ($this->control->tpl['action_delete']) {
control->tpl['sales_representatives']; ?>
-adherent->enabled)) { ?>
+
trans("LinkedToDolibarrMember"); ?>
control->tpl['linked_member']; ?>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index d5ccb96eaf7..331fb58ae9c 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -47,7 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
}
if (!empty($conf->accounting->enabled)) {
@@ -68,7 +68,7 @@ if (! empty($conf->eventorganization->enabled)) {
$langs->loadLangs(array("companies", "commercial", "bills", "banks", "users"));
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
$langs->load("members");
}
if (!empty($conf->categorie->enabled)) {
@@ -3035,7 +3035,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
// Module Adherent
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$langs->load("members");
print ' '.$langs->trans("LinkedToDolibarrMember").' ';
print '';
@@ -3108,7 +3108,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$adh = new Adherent($db);
$result = $adh->fetch('', '', $object->id);
if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS)) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ee2d71f6d12..3f7bb239c51 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -214,8 +214,8 @@ class Societe extends CommonObject
'mode_reglement_supplier' =>array('type'=>'integer', 'label'=>'Mode reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>305),
'cond_reglement_supplier' =>array('type'=>'integer', 'label'=>'Cond reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>308),
'outstanding_limit' =>array('type'=>'double(24,8)', 'label'=>'OutstandingBill', 'enabled'=>1, 'visible'=>-1, 'position'=>310, 'isameasure'=>1),
- 'order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Order min amount', 'enabled'=>'!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>315, 'isameasure'=>1),
- 'supplier_order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Supplier order min amount', 'enabled'=>'!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>320, 'isameasure'=>1),
+ 'order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Order min amount', 'enabled'=>'isModEnabled('commande') && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>315, 'isameasure'=>1),
+ 'supplier_order_min_amount' =>array('type'=>'double(24,8)', 'label'=>'Supplier order min amount', 'enabled'=>'isModEnabled('commande') && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)', 'visible'=>-1, 'position'=>320, 'isameasure'=>1),
'fk_shipping_method' =>array('type'=>'integer', 'label'=>'Fk shipping method', 'enabled'=>1, 'visible'=>-1, 'position'=>330),
'tva_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Tva assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>335),
'localtax1_assuj' =>array('type'=>'tinyint(4)', 'label'=>'Localtax1 assuj', 'enabled'=>1, 'visible'=>-1, 'position'=>340),
@@ -1561,7 +1561,7 @@ class Societe extends CommonObject
if (!$error && $nbrowsaffected) {
// Update information on linked member if it is an update
- if (!$nosyncmember && !empty($conf->adherent->enabled)) {
+ if (!$nosyncmember && isModEnabled('adherent')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
dol_syslog(get_class($this)."::update update linked member");
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 53408fd00ff..a8f250f29d5 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -170,7 +170,7 @@ if ($object->client) {
if (isModEnabled("propal") && $user->rights->propal->lire) {
$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
}
- if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ if (isModEnabled('commande') && $user->rights->commande->lire) {
$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
}
if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index 1bc64658735..14c1347c98c 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -43,7 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 5b9bd1046ef..f22a5fb440b 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -791,7 +791,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
if (isModEnabled("propal") && $user->rights->propal->lire) {
$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
}
- if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ if (isModEnabled('commande') && $user->rights->commande->lire) {
$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
}
if (isModEnabled('facture') && $user->rights->facture->lire) {
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index a061933ba11..1767973a001 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -205,7 +205,7 @@ if ($id > 0 || !empty($ref)) {
}
// additionnal list with adherents of company
- if (!empty($conf->adherent->enabled) && $user->rights->adherent->lire) {
+ if (isModEnabled('adherent') && $user->rights->adherent->lire) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 0dd8a7f9d08..2c6dd47b234 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -36,7 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/userbankaccount.class.php';
if (isModEnabled('holiday')) {
require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
}
-if (!empty($conf->expensereport->enabled)) {
+if (isModEnabled('expensereport')) {
require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
}
if (!empty($conf->salaries->enabled)) {
@@ -361,7 +361,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
print " ';
$text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -691,7 +691,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac
}
// Latest expense report
- if (!empty($conf->expensereport->enabled) &&
+ if (isModEnabled('expensereport') &&
($user->rights->expensereport->readall || ($user->rights->expensereport->lire && $object->id == $user->id))
) {
$exp = new ExpenseReport($db);
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 45d7c91a8bb..7ae7bb70566 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -51,7 +51,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
if (!empty($conf->ldap->enabled)) {
require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
}
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
}
if (!empty($conf->categorie->enabled)) {
@@ -950,7 +950,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print " ';
$text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1498,7 +1498,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print " ';
$text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -1707,7 +1707,7 @@ if ($action == 'create' || $action == 'adduserldap') {
}
// Module Adherent
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$langs->load("members");
print ' '.$langs->trans("LinkedToDolibarrMember").' ';
print '';
@@ -2239,7 +2239,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print " ';
$text = $langs->trans("ForceUserExpenseValidator");
print $form->textwithpicto($text, $langs->trans("ValidatorIsSupervisorByDefault"), 1, 'help');
@@ -2629,7 +2629,7 @@ if ($action == 'create' || $action == 'adduserldap') {
}
// Module Adherent
- if (!empty($conf->adherent->enabled)) {
+ if (isModEnabled('adherent')) {
$langs->load("members");
print ' '.$langs->trans("LinkedToDolibarrMember").' ';
print '';
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 6d5a27cd8ba..1df44179461 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -192,19 +192,19 @@ if (isModEnabled("societe")) {
if (!empty($conf->project->enabled)) {
$tmparray['projet/index.php?mainmenu=project&leftmenu='] = 'ProjectsArea';
}
-if (isModEnabled('holiday') || !empty($conf->expensereport->enabled)) {
+if (isModEnabled('holiday') || isModEnabled('expensereport')) {
$tmparray['hrm/index.php?mainmenu=hrm&leftmenu='] = 'HRMArea'; // TODO Complete list with first level of menus
}
if (isModEnabled("product") || isModEnabled("service")) {
$tmparray['product/index.php?mainmenu=products&leftmenu='] = 'ProductsAndServicesArea';
}
-if (isModEnabled("propal") || !empty($conf->commande->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->contrat->enabled)) {
+if (isModEnabled("propal") || isModEnabled('commande') || !empty($conf->ficheinter->enabled) || !empty($conf->contrat->enabled)) {
$tmparray['comm/index.php?mainmenu=commercial&leftmenu='] = 'CommercialArea';
}
if (!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled)) {
$tmparray['compta/index.php?mainmenu=compta&leftmenu='] = 'AccountancyTreasuryArea';
}
-if (!empty($conf->adherent->enabled)) {
+if (isModEnabled('adherent')) {
$tmparray['adherents/index.php?mainmenu=members&leftmenu='] = 'MembersArea';
}
if (isModEnabled('agenda')) {
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
index ccc61d806af..a8d110eb081 100644
--- a/htdocs/webhook/target_agenda.php
+++ b/htdocs/webhook/target_agenda.php
@@ -227,7 +227,7 @@ if ($object->id > 0) {
print '';
- if (!empty($conf->agenda->enabled)) {
+ if (isModEnabled('agenda')) {
if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
print '
'.$langs->trans("AddAction").' ';
} else {
@@ -237,7 +237,7 @@ if ($object->id > 0) {
print '
';
$htmllink .= '';
- if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+ if (($cid || $socid) && isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
$addlink = 'AC_SKYPE';
$link = '';
if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
@@ -7371,7 +7371,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = '__THIRDPARTY_NOTE_PUBLIC__';
$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = '__THIRDPARTY_NOTE_PRIVATE__';
}
- if (!empty($conf->adherent->enabled) && (!is_object($object) || $object->element == 'adherent')) {
+ if (isModEnabled('adherent') && (!is_object($object) || $object->element == 'adherent')) {
$substitutionarray['__MEMBER_ID__'] = '__MEMBER_ID__';
$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 7e173bd269e..94e14a90267 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -64,14 +64,14 @@ function ldap_prepare_head()
$h++;
}
- if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE)) {
+ if (isModEnabled('adherent') && !empty($conf->global->LDAP_MEMBER_ACTIVE)) {
$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
$head[$h][1] = $langs->trans("LDAPMembersSynchro");
$head[$h][2] = 'members';
$h++;
}
- if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE)) {
+ if (isModEnabled('adherent') && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE)) {
$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
$head[$h][2] = 'memberstypes';
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 9a5e9ae56a5..9128be56ea1 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -42,7 +42,7 @@ function commande_prepare_head(Commande $object)
$h = 0;
$head = array();
- if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+ if (isModEnabled('commande') && $user->rights->commande->lire) {
$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
$head[$h][1] = $langs->trans("CustomerOrder");
$head[$h][2] = 'order';
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index a1446bf6964..710b2462afa 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -417,7 +417,7 @@ function show_stats_for_company($product, $socid)
print '