From 0810e6756ae4ae8f43d004f27c6cf60a97272d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 9 Jun 2014 22:48:16 +0200 Subject: [PATCH 1/3] Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration --- ChangeLog | 3 +++ htdocs/admin/fichinter.php | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2e0ea3bcc99..9375141211a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +***** ChangeLog for 3.5.4 compared to 3.5.2 ***** +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 fd2ea1dc966..da00762040a 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 ''; - echo "$name"; + print (empty($module->name)?$name:$module->name); print "\n"; require_once $dir.$file; $module = new $classname($db); From 83b58aca891700eec42bf26823f06976351b1106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 9 Jun 2014 22:49:27 +0200 Subject: [PATCH 2/3] Typo --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9375141211a..a857b216ced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ English Dolibarr ChangeLog -------------------------------------------------------------- -***** ChangeLog for 3.5.4 compared to 3.5.2 ***** +***** 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 ***** From 8a22a708b47492f0a47371539f1c0353b799bef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 9 Jun 2014 22:55:38 +0200 Subject: [PATCH 3/3] Fixed the bug for supplier invoice and supplier order pages --- htdocs/admin/supplier_invoice.php | 7 ++++++- htdocs/admin/supplier_order.php | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 5800ccc3a9b..6ee60ddfb33 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 "\n"; - print "".$name."\n"; + print ""; + print (empty($module->name)?$name:$module->name); + print "\n"; print "\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 07d7d731652..f5ef9f4331f 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 "\n"; - print "".$name."\n"; + print ""; + print (empty($module->name)?$name:$module->name); + print "\n"; print "\n"; require_once $dir.$file; $module = new $classname($db,$specimenthirdparty);