diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index cc8c6fe0547..3f7e6f2ed8b 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -52,18 +52,18 @@ foreach($linkedObjectBlock as $key => $objectlink)
$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
-
- | trans("Proposal"); ?> |
- getNomUrl(1); ?> |
- ref_client; ?> |
- date,'day'); ?> |
- " data-element="element; ?>" data-elementid="id; ?>" >
+ | trans("Proposal"); ?> |
+ getNomUrl(1); ?> |
+ ref_client; ?> |
+ date,'day'); ?> |
+ rights->propale->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?> |
- getLibStatut(3); ?> |
- id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink")); ?> |
+ getLibStatut(3); ?> |
+ id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink")); ?> |
$objectlink)
$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
-
- | trans("CustomerOrder"); ?> |
- getNomUrl(1); ?> |
- ref_client; ?> |
- date,'day'); ?> |
- " data-element="element; ?>" data-elementid="id; ?>" >
+ | trans("CustomerOrder"); ?> |
+ getNomUrl(1); ?> |
+ ref_client; ?> |
+ date,'day'); ?> |
+ rights->commande->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?> |
- getLibStatut(3); ?> |
-
+ | getLibStatut(3); ?> |
+
element != 'shipping') {
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index ca3ec7c89c0..e77a4975789 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -47,12 +47,12 @@ foreach($linkedObjectBlock as $key => $objectlink)
$trclass=($var?'pair':'impair');
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- |
- | trans("CustomerInvoice"); ?> |
- getNomUrl(1); ?> |
- ref_client; ?> |
- date,'day'); ?> |
- " data-element="element; ?>" data-elementid="id; ?>" >
+ | trans("CustomerInvoice"); ?> |
+ getNomUrl(1); ?> |
+ ref_client; ?> |
+ date,'day'); ?> |
+ rights->facture->lire) {
$sign = 1;
if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
@@ -66,8 +66,8 @@ foreach($linkedObjectBlock as $key => $objectlink)
echo ''.price($objectlink->total_ht).'';
}
} ?> |
- getLibStatut(3); ?> |
- id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink")); ?> |
+ getLibStatut(3); ?> |
+ id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink")); ?> |
';
- print '';
+ print '';
print '';
print '| '.$langs->trans("Type").' | ';
@@ -5933,7 +5933,7 @@ class Form
global $noMoreLinkedObjectBlockAfter;
$noMoreLinkedObjectBlockAfter=1;
}
-
+
$res=@include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
if ($res)
{