Skip to content

Commit

Permalink
fix wrong construction of description when creatin from orders (it wa…
Browse files Browse the repository at this point in the history
…s putting a mess on update)
  • Loading branch information
altairis-tof committed May 22, 2013
1 parent f8ca842 commit 9926006
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions htdocs/fichinter/fiche.php
Expand Up @@ -195,8 +195,6 @@
// service prédéfini
if ($lines[$i]->fk_product > 0)
{
$product_static = new Product($db);

// Define output language
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
{
Expand All @@ -219,15 +217,8 @@
$label = $lines[$i]->product_label;
}

$product_static->type=$lines[$i]->fk_product_type;
$product_static->id=$lines[$i]->fk_product;
$product_static->ref=$lines[$i]->ref;
$product_static->libelle=$label;
$desc=$product_static->getNomUrl(0);
$desc.= ' - '.$label;
$desc = $label;
$desc .= ' ('.$langs->trans('Quantity').': '.$lines[$i]->qty.')';
if ($conf->global->PRODUIT_DESC_IN_FORM)
$desc .= ($lines[$i]->desc && $lines[$i]->desc!=$lines[$i]->libelle)?'<br>'.dol_htmlentitiesbr($lines[$i]->desc):'';
}
else {
$desc = dol_htmlentitiesbr($lines[$i]->desc);
Expand Down

0 comments on commit 9926006

Please sign in to comment.