From ba052d463623f83fe83770d05927c205f32feacd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 28 Jan 2011 08:47:36 +0000 Subject: [PATCH] Fix: $soc redefined to $buyer --- htdocs/core/tpl/freeproductline_create.tpl.php | 4 ++-- htdocs/core/tpl/predefinedproductline_create.tpl.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 00fa589a710..66688b69190 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -63,13 +63,13 @@ if ($conf->global->PRODUIT_USE_MARKUP) $colspan = 'colspan="2"'; tva_assuj == "0") echo '0'; + if ($buyer->tva_assuj == "0") echo '0'; else $html->select_tva('np_tva_tx', $conf->defaulttx, $seller, $buyer); ?> "> - % + % diff --git a/htdocs/core/tpl/predefinedproductline_create.tpl.php b/htdocs/core/tpl/predefinedproductline_create.tpl.php index a6a7f5c184e..b7d504ac9c2 100644 --- a/htdocs/core/tpl/predefinedproductline_create.tpl.php +++ b/htdocs/core/tpl/predefinedproductline_create.tpl.php @@ -60,7 +60,7 @@ $colspan = 'colspan="3"'; global->PRODUIT_MULTIPRICES) - $html->select_produits('','idprod','',$conf->product->limit_size,$soc->price_level); + $html->select_produits('','idprod','',$conf->product->limit_size,$buyer->price_level); else $html->select_produits('','idprod','',$conf->product->limit_size); @@ -75,7 +75,7 @@ $colspan = 'colspan="3"'; ?> - % + % " name="addline">