diff --git a/ChangeLog b/ChangeLog index 101e70ca8b5b5927f419924caee1ea41f922a392..9c9983ba6f83f8d65d9852bc6cbb56eaf1cf7efe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.5.4 compared to 3.5.3 ***** +Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration + ***** ChangeLog for 3.5.3 compared to 3.5.2 ***** Fix: Error on field accountancy code for export profile of invoices. Fix: [ bug #1351 ] VIES verification link broken. diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index fd2ea1dc9664d40e75ea13baddd4fe62bb823075..da00762040a47dc193f15f1d2eef412ac911f973 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -376,13 +376,16 @@ foreach ($dirmodels as $reldir) { if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') { + $var=!$var; + $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); - $var=!$var; + require_once $dir.'/'.$file; + $module = new $classname($db); print '<tr '.$bc[$var].'><td>'; - echo "$name"; + print (empty($module->name)?$name:$module->name); print "</td><td>\n"; require_once $dir.$file; $module = new $classname($db); diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 5800ccc3a9b3d88ab9ccedcf0f8500f76f0fcd22..6ee60ddfb3382948522502524ea10c74308adf81 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -372,9 +372,14 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); + require_once $dir.'/'.$file; + $module = new $classname($db, new FactureFournisseur($db)); + $var=!$var; print "<tr ".$bc[$var].">\n"; - print "<td>".$name."</td>\n"; + print "<td>"; + print (empty($module->name)?$name:$module->name); + print "</td>\n"; print "<td>\n"; require_once $dir.$file; $module = new $classname($db,$specimenthirdparty); diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 07d7d7316526e02e59debf1d4bf3d37111e50a35..f5ef9f4331f735448fd574d77815f16b16ae77eb 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -367,9 +367,14 @@ foreach ($dirmodels as $reldir) $name = substr($file, 4, dol_strlen($file) -16); $classname = substr($file, 0, dol_strlen($file) -12); + require_once $dir.'/'.$file; + $module = new $classname($db, new CommandeFournisseur($db)); + $var=!$var; print "<tr ".$bc[$var].">\n"; - print "<td>".$name."</td>\n"; + print "<td>"; + print (empty($module->name)?$name:$module->name); + print "</td>\n"; print "<td>\n"; require_once $dir.$file; $module = new $classname($db,$specimenthirdparty);