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

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-04 17:53:59 +02:00
commit 9fe5f242a7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/expedition/card.php
View File

@ -1576,7 +1576,7 @@ if ($action == 'create')
$srcLine = new OrderLine($db); $srcLine = new OrderLine($db);
$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline $srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
$line = new ExpeditionLigne($db); $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); $line->array_options = array_merge($line->array_options, $srcLine->array_options);
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked); print $line->showOptionals($extrafieldsline, 'edit', array('style'=>$bc[$var], 'colspan'=>$colspan),$indiceAsked);

10
htdocs/resource/list.php
View File

@ -242,14 +242,14 @@ print "</tr>\n";
if ($ret) if ($ret)
{ {
foreach ($object->lines as $obj) foreach ($object->lines as $resource)
{ {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
if (! empty($arrayfields['t.ref']['checked'])) if (! empty($arrayfields['t.ref']['checked']))
{ {
print '<td>'; print '<td>';
print $obj->getNomUrl(5); print $resource->getNomUrl(5);
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -257,7 +257,7 @@ if ($ret)
if (! empty($arrayfields['ty.label']['checked'])) if (! empty($arrayfields['ty.label']['checked']))
{ {
print '<td>'; print '<td>';
print $obj->type_label; print $resource->type_label;
print '</td>'; print '</td>';
if (! $i) $totalarray['nbfield']++; if (! $i) $totalarray['nbfield']++;
} }
@ -266,11 +266,11 @@ if ($ret)
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php'; include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
print '<td align="center">'; print '<td align="center">';
print '<a href="./card.php?action=edit&id='.$obj->id.'">'; print '<a href="./card.php?action=edit&id='.$resource->id.'">';
print img_edit(); print img_edit();
print '</a>'; print '</a>';
print '&nbsp;'; print '&nbsp;';
print '<a href="./card.php?action=delete&id='.$obj->id.'">'; print '<a href="./card.php?action=delete&id='.$resource->id.'">';
print img_delete(); print img_delete();
print '</a>'; print '</a>';
print '</td>'; print '</td>';