lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1648 from marcosgdf/bug-1415

Browse Source 
Fix: [ bug #1415 ] Intervention document model name and suppliers model names is not shown properly in module configuration
This commit is contained in:
Laurent Destailleur 2014-06-10 01:28:56 +02:00
commit 9e91225936
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
English Dolibarr ChangeLog 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 ***** ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
Fix: Error on field accountancy code for export profile of invoices. Fix: Error on field accountancy code for export profile of invoices.
Fix: [ bug #1351 ] VIES verification link broken. Fix: [ bug #1351 ] VIES verification link broken.

7
htdocs/admin/fichinter.php
View File

@ -376,13 +376,16 @@ foreach ($dirmodels as $reldir)
{ {
if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_') if (substr($file, dol_strlen($file) -12) == '.modules.php' && substr($file,0,4) == 'pdf_')
{ {
$var=!$var;
$name = substr($file, 4, dol_strlen($file) -16); $name = substr($file, 4, dol_strlen($file) -16);
$classname = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12);
$var=!$var; require_once $dir.'/'.$file;
$module = new $classname($db);
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
echo "$name"; print (empty($module->name)?$name:$module->name);
print "</td><td>\n"; print "</td><td>\n";
require_once $dir.$file; require_once $dir.$file;
$module = new $classname($db); $module = new $classname($db);

7
htdocs/admin/supplier_invoice.php
View File

@ -372,9 +372,14 @@ foreach ($dirmodels as $reldir)
$name = substr($file, 4, dol_strlen($file) -16); $name = substr($file, 4, dol_strlen($file) -16);
$classname = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12);
require_once $dir.'/'.$file;
$module = new $classname($db, new FactureFournisseur($db));
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">\n"; 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"; print "<td>\n";
require_once $dir.$file; require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty); $module = new $classname($db,$specimenthirdparty);

7
htdocs/admin/supplier_order.php
View File

@ -367,9 +367,14 @@ foreach ($dirmodels as $reldir)
$name = substr($file, 4, dol_strlen($file) -16); $name = substr($file, 4, dol_strlen($file) -16);
$classname = substr($file, 0, dol_strlen($file) -12); $classname = substr($file, 0, dol_strlen($file) -12);
require_once $dir.'/'.$file;
$module = new $classname($db, new CommandeFournisseur($db));
$var=!$var; $var=!$var;
print "<tr ".$bc[$var].">\n"; 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"; print "<td>\n";
require_once $dir.$file; require_once $dir.$file;
$module = new $classname($db,$specimenthirdparty); $module = new $classname($db,$specimenthirdparty);