diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 48832c0eb86..a50a3a53896 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -223,7 +223,7 @@ if ($socid)
 		print '</td></tr>';
 	}
 
-	if (! empty($conf->global->MAIN_MODULE_BARCODE))
+	if (! empty($conf->barcode->enabled))
 	{
 		print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
 	}
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index d25245c7288..6a72d73cb50 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -105,7 +105,7 @@ if ($socid)
 		print '</td></tr>';
 	}
 
-	if ($conf->global->MAIN_MODULE_BARCODE)
+	if (! empty($conf->barcode->enabled))
 	{
 		print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$soc->barcode.'</td></tr>';
 	}
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 181e248f849..d519f125c09 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -96,7 +96,7 @@
 </tr>
 <?php } }?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index c0e865c6aef..4d89f95b8c8 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -111,7 +111,7 @@ if ($this->control->tpl['fournisseur']) {
 </tr>
 <?php } }?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index a0a9c7ec47a..1eaf013af0d 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -69,7 +69,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
 </tr>
 <?php } ?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 6c7e029b8e3..ac4e4cceef0 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -106,7 +106,7 @@
 </tr>
 <?php } }?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 19d7f4b67d5..296869bbae3 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -108,7 +108,7 @@ if ($this->control->tpl['fournisseur']) {
 </tr>
 <?php } }?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 6f82f5c6aeb..a47f3c7711f 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -68,7 +68,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company');
 </tr>
 <?php } ?>
 
-<?php if ($conf->global->MAIN_MODULE_BARCODE) { ?>
+<?php if (! empty($conf->barcode->enabled)) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 156133c9252..a81426f1739 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -784,7 +784,7 @@ else
         print '</td></tr>';
 
         // Barcode
-        if (! empty($conf->global->MAIN_MODULE_BARCODE))
+        if (! empty($conf->barcode->enabled))
         {
             print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
             print '</td></tr>';
@@ -1218,7 +1218,7 @@ else
             }
 
             // Barcode
-            if ($conf->global->MAIN_MODULE_BARCODE)
+            if (! empty($conf->barcode->enabled))
             {
                 print '<tr><td valign="top">'.$langs->trans('Gencod').'</td><td colspan="3"><input type="text" name="barcode" value="'.$object->barcode.'">';
                 print '</td></tr>';
@@ -1469,7 +1469,7 @@ else
         if (! empty($conf->global->SOCIETE_USEPREFIX)) $rowspan++;
         if (! empty($object->client)) $rowspan++;
         if (! empty($conf->fournisseur->enabled) && $object->fournisseur && ! empty($user->rights->fournisseur->lire)) $rowspan++;
-        if (! empty($conf->global->MAIN_MODULE_BARCODE)) $rowspan++;
+        if (! empty($conf->barcode->enabled)) $rowspan++;
         if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
         $htmllogobar='';
         if ($showlogo || $showbarcode)
@@ -1514,7 +1514,7 @@ else
         }
 
         // Barcode
-        if (! empty($conf->global->MAIN_MODULE_BARCODE))
+        if (! empty($conf->barcode->enabled))
         {
             print '<tr><td>';
             print $langs->trans('Gencod').'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'">'.$object->barcode;