diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php index f3e93a6fd84..4f2d3bdd1ad 100644 --- a/htdocs/admin/barcode.php +++ b/htdocs/admin/barcode.php @@ -78,22 +78,22 @@ $var=true; while (($file = readdir($handle))!==false) { - if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') - { + if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') + { if (is_readable($dir.$file)) { if (eregi('(.*)\.modules\.php',$file,$reg)) { - $filebis=$reg[1]; + $filebis=$reg[1]; // Chargement de la classe de codage - require_once($dir.$file); - $classname = "mod".ucfirst($filebis); - $module = new $classname($db); + require_once($dir.$file); + $classname = "mod".ucfirst($filebis); + $module = new $classname($db); // Show modules according to features level - if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; - if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; + if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; + if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; $barcodelist[$filebis]=$module->info(); } diff --git a/mysql/migration/2.2.0-2.4.0.sql b/mysql/migration/2.2.0-2.4.0.sql index dcda79a5ccc..a1a4b33cffc 100644 --- a/mysql/migration/2.2.0-2.4.0.sql +++ b/mysql/migration/2.2.0-2.4.0.sql @@ -11,3 +11,4 @@ ALTER TABLE llx_societe_adresse_livraison ADD COLUMN tel varchar(20) after fk_pa ALTER TABLE llx_societe_adresse_livraison ADD COLUMN fax varchar(20) after tel; alter table llx_c_barcode_type modify coder varchar(16) NOT NULL; +update llx_c_barcode_type set coder = 0 where coder in (1,2); \ No newline at end of file