diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 26b2d729f82..0b03f8fc608 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1576,7 +1576,7 @@ if ($action == 'create')
$srcLine = new OrderLine($db);
$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
$line = new ExpeditionLigne($db);
- $line->fetch_optionals($line->id);
+ //$line->fetch_optionals($line->id);
$line->array_options = array_merge($line->array_options, $srcLine->array_options);
print '
';
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 8ef3168ee96..85be267613d 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -1,7 +1,7 @@
* Copyright (C) 2018 Nicolas ZABOURI
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -242,14 +242,14 @@ print "
\n";
if ($ret)
{
- foreach ($object->lines as $obj)
+ foreach ($object->lines as $resource)
{
print '';
if (! empty($arrayfields['t.ref']['checked']))
{
print '| ';
- print $obj->getNomUrl(5);
+ print $resource->getNomUrl(5);
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -257,7 +257,7 @@ if ($ret)
if (! empty($arrayfields['ty.label']['checked']))
{
print '';
- print $obj->type_label;
+ print $resource->type_label;
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -266,11 +266,11 @@ if ($ret)
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
print '';
- print '';
+ print '';
print img_edit();
print '';
print ' ';
- print '';
+ print '';
print img_delete();
print '';
print ' | ';