--- /tmp/dsg/dolibarr/htdocs/commande/tpl/github_19.0.3_linkedobjectblock.tpl.php
+++ /tmp/dsg/dolibarr/htdocs/commande/tpl/client_linkedobjectblock.tpl.php
@@ -26 +26 @@
-print "\n";
+print "\n";
@@ -41,2 +41,3 @@
-foreach ($linkedObjectBlock as $key => $objectlink) {
- $ilink++;
+foreach ($linkedObjectBlock as $key => $objectlink)
+{
+ $ilink++;
@@ -44,27 +45,25 @@
- $trclass = 'oddeven';
- if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
- $trclass .= ' liste_sub_total';
- }
- echo '
';
- echo ''.$langs->trans("CustomerOrder");
- if (!empty($showImportButton) && getDolGlobalString('MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES')) {
- print ' ';
- echo ' | '.$objectlink->getNomUrl(1).' | ';
- echo ''.$objectlink->ref_client.' | ';
- echo ''.dol_print_date($objectlink->date, 'day').' | ';
- echo '';
- if ($user->hasRight('commande', 'lire')) {
- $total = $total + $objectlink->total_ht;
- echo price($objectlink->total_ht);
- }
- echo ' | ';
- echo ''.$objectlink->getLibStatut(3).' | ';
- echo '';
- // For now, shipments must stay linked to order, so link is not deletable
- if ($object->element != 'shipping') {
- echo 'id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'';
- }
- echo ' | ';
- echo "
\n";
+ $trclass = 'oddeven';
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+ echo '';
+ echo ''.$langs->trans("CustomerOrder");
+ if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+ print ' ';
+ echo ' | '.$objectlink->getNomUrl(1).' | ';
+ echo ''.$objectlink->ref_client.' | ';
+ echo ''.dol_print_date($objectlink->date, 'day').' | ';
+ echo '';
+ if ($user->rights->commande->lire) {
+ $total = $total + $objectlink->total_ht;
+ echo price($objectlink->total_ht);
+ }
+ echo ' | ';
+ echo ''.$objectlink->getLibStatut(3).' | ';
+ echo '';
+ // For now, shipments must stay linked to order, so link is not deletable
+ if ($object->element != 'shipping') {
+ echo 'id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'';
+ }
+ echo ' | ';
+ echo "
\n";
@@ -73,9 +72,9 @@
- echo '';
- echo ''.$langs->trans("Total").' | ';
- echo ' | ';
- echo ' | ';
- echo ' | ';
- echo ''.price($total).' | ';
- echo ' | ';
- echo ' | ';
- echo "
\n";
+ echo '';
+ echo ''.$langs->trans("Total").' | ';
+ echo ' | ';
+ echo ' | ';
+ echo ' | ';
+ echo ''.price($total).' | ';
+ echo ' | ';
+ echo ' | ';
+ echo "
\n";