diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 3bb4479db77..fce23e74e18 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var;
?>
>|
- '.img_object($langs->trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?>"> |
+ trans("ShowPropal"),"propal").' '.$linkedObjectBlock->ref; ?>
ref_client; ?> |
date,'day'); ?> |
total_ht); ?> |
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 7462d17a5b1..0c7f61b1082 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var;
?>
>|
- '.img_object($langs->trans("ShowOrder"),"order").' '.$linkedObjectBlock->ref; ?>"> |
+ trans("ShowOrder"),"order").' '.$linkedObjectBlock->ref; ?>
date,'day'); ?> |
total_ht); ?> |
getLibStatut(3); ?> |
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 32e778a7fc5..42e9aa745d1 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -42,7 +42,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var;
?>
>|
- '.img_object($langs->trans("ShowBill"),"bill").' '.$linkedObjectBlock->ref; ?>"> |
+ trans("ShowBill"),"bill").' '.$linkedObjectBlock->ref; ?>
date,'day'); ?> |
total_ht); ?> |
getLibStatut(3); ?> |
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index f064d7545ea..90125502353 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -41,7 +41,7 @@ for ($i = 0 ; $i < $num ; $i++)
$var=!$var;
?>
>|
- '.img_object($langs->trans("ShowContract"),"contract").' '.$linkedObjectBlock->ref; ?>"> |
+ trans("ShowContract"),"contract").' '.$linkedObjectBlock->ref; ?>
date,'day'); ?> |
total_ht); ?> |
getLibStatut(3); ?> |
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index b30b65cb3fa..d659a9883fc 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -806,7 +806,7 @@ class CommonObject
}
}
}
-
+
/**
* \brief Get max value for rang
*/
@@ -905,12 +905,12 @@ class CommonObject
$fieldtva='total_tva';
$fieldlocaltax1='total_localtax1';
$fieldlocaltax2='total_localtax2';
-
- if ($this->element == 'facture_fourn')
+
+ if ($this->element == 'facture_fourn')
{
$fieldtva='tva';
}
-
+
$sql = 'SELECT qty, total_ht, '.$fieldtva.' as total_tva, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2, total_ttc';
$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
$sql.= ' WHERE '.$this->fk_element.' = '.$this->id;
@@ -944,24 +944,24 @@ class CommonObject
// Now update field total_ht, total_ttc and tva
$fieldht='total_ht';
-
+
$fieldtva='tva';
-
+
$fieldlocaltax1='localtax1';
$fieldlocaltax2='localtax2';
-
+
$fieldttc='total_ttc';
-
+
if ($this->element == 'facture' || $this->element == 'facturerec')
{
$fieldht='total';
}
-
- if ($this->element == 'facture_fourn')
+
+ if ($this->element == 'facture_fourn')
{
$fieldtva='total_tva';
}
-
+
if ($this->element == 'propal')
{
$fieldttc='total';