diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 2ed8b081ceb..d57d594beac 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -47,8 +47,8 @@ foreach($linkedObjectBlock as $key => $objectlink)
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
- | trans("CustomerInvoice"); ?> |
- getNomUrl(1); ?> |
+ trans("CustomerInvoice"); ?> |
+ getNomUrl(1); ?> |
ref_client; ?> |
date,'day'); ?> |
$objectlink)
if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total';
?>
|
- | trans("RepeatableInvoice"); ?> |
- getNomUrl(1); ?> |
- |
- date_when,'day'); ?> |
- trans("RepeatableInvoice"); ?> |
+ getNomUrl(1); ?> |
+ |
+ date_when,'day'); ?> |
+ rights->facture->lire) {
$total = $total + $objectlink->total_ht;
echo price($objectlink->total_ht);
} ?> |
-
- getLibStatut(3);
- ?>
- |
- id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> |
+ getLibStatut(3); ?> |
+ id.'&action=dellink&dellinkid='.$key; ?>">transnoentitiesnoconv("RemoveLink"), 'unlink'); ?> |
1)
+{
+ ?>
+
+ | trans("Total"); ?> |
+ |
+ |
+ |
+ |
+ |
+ |
+
+
\ No newline at end of file
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index cefa563fc86..4194692c5d6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -6314,7 +6314,7 @@ class Form
$hookmanager->initHooks(array('commonobject'));
$parameters=array(
'morehtmlright' => $morehtmlright,
- 'compatibleImportElementsList' =>& $compatibleImportElementsList,
+ 'compatibleImportElementsList' => &$compatibleImportElementsList,
);
$reshook=$hookmanager->executeHooks('showLinkedObjectBlock',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -6495,6 +6495,7 @@ class Form
$hookmanager->initHooks(array('commonobject'));
$parameters=array('listofidcompanytoscan' => $listofidcompanytoscan);
$reshook=$hookmanager->executeHooks('showLinkToObjectBlock',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+
if (empty($reshook))
{
if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
@@ -6527,9 +6528,11 @@ class Form
$num = $this->db->num_rows($resqllist);
$i = 0;
- print '