From f0aef885893cd217904eddb63c7a907e76abed4b Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe.battarel@altairis.fr>
Date: Fri, 5 Feb 2016 13:49:19 +0100
Subject: [PATCH] better fix
---
htdocs/core/class/commonobject.class.php | 4 +++-
htdocs/core/tpl/objectline_edit.tpl.php | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 1cf042e9d13..a78a1cfea49 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3051,6 +3051,8 @@ abstract class CommonObject
$text.= ' - '.(! empty($line->label)?$line->label:$label);
$description.=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
}
+
+ $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
// Output template part (modules that overwrite templates must declare this into descriptor)
// Use global variables + $dateSelector + $seller and $buyer
@@ -3074,7 +3076,7 @@ abstract class CommonObject
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"';
else $placeholder=' title="'.$langs->trans("Label").'"';
- $pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
+ $line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx/100)), 'MU');
// Output template part (modules that overwrite templates must declare this into descriptor)
// Use global variables + $dateSelector + $seller and $buyer
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index 7d570531213..d61831cfec2 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -124,7 +124,7 @@ $coldisplay=-1; // We remove first td
if ($inputalsopricewithtax)
{
$coldisplay++;
- print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($pu_ttc)?price($pu_ttc,0,'',0):'').'"';
+ print '<td align="right"><input type="text" class="flat" size="8" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc)?price($line->pu_ttc,0,'',0):'').'"';
if ($this->situation_counter > 1) print ' readonly';
print '></td>';
}
--
GitLab