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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-09 16:49:38 +02:00
commit 9ba22b97b6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/commande/card.php
View File

@ -1863,6 +1863,7 @@ if ($action == 'create' && $usercancreate)
$author = new User($db); $author = new User($db);
$author->fetch($object->user_author_id); $author->fetch($object->user_author_id);
$object->fetch_thirdparty();
$res = $object->fetch_optionals(); $res = $object->fetch_optionals();
$head = commande_prepare_head($object); $head = commande_prepare_head($object);

2
htdocs/fourn/commande/dispatch.php
View File

@ -1290,7 +1290,7 @@ if ($id > 0 || !empty($ref)) {
print '</td>'; print '</td>';
} }
if ($action != 'editline' ||  && $lineid != $objp->dispatchlineid) if ($action != 'editline' || $lineid != $objp->dispatchlineid)
{ {
print '<td class="linecoledit center">'; print '<td class="linecoledit center">';
print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';