--- /tmp/dsg/dolibarr/htdocs/expedition/tpl/github_linkedobjectblock.tpl.php +++ /tmp/dsg/dolibarr/htdocs/expedition/tpl/client_linkedobjectblock.tpl.php @@ -39,36 +39,36 @@ $ilink = 0; foreach ($linkedObjectBlock as $key => $objectlink) { - $ilink++; + $ilink++; - $trclass = 'oddeven'; - if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total'; - ?> + $trclass = 'oddeven'; + if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total'; + ?> trans("Shipment"); ?> getNomUrl(1); ?> date_delivery, 'day'); ?> rights->expedition->lire) { - $total = $total + $objectlink->total_ht; - echo price($objectlink->total_ht); - } ?> + if ($user->rights->expedition->lire) { + $total = $total + $objectlink->total_ht; + echo price($objectlink->total_ht); + } ?> getLibStatut(3); ?> element != 'commande') { - ?> + // For now, shipments must stay linked to order, so link is not deletable + if ($object->element != 'commande') { + ?> ">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> + } + ?> 1) { - ?> + ?> trans("Total"); ?>