From ff95bb164427d221935014ef780828fff0b882ce Mon Sep 17 00:00:00 2001
From: paolo
Date: Sat, 4 Jun 2016 18:31:31 +0200
Subject: [PATCH] fix #4467
---
htdocs/product/stock/replenish.php | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index cdbb4cafad3..25dd6728df8 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -241,7 +241,7 @@ $form = new Form($db);
$title = $langs->trans('Status');
-$sql = 'SELECT p.rowid, p.ref, p.label, p.price,';
+$sql = 'SELECT p.rowid, p.ref, p.label,p.description, p.price,';
$sql.= ' p.price_ttc, p.price_base_type,p.fk_product_type,';
$sql.= ' p.tms as datem, p.duration, p.tobuy,';
$sql.= ' p.desiredstock, p.seuil_stock_alerte as alertstock,';
@@ -490,7 +490,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
// Multilangs
if (! empty($conf->global->MAIN_MULTILANGS))
{
- $sql = 'SELECT label';
+ $sql = 'SELECT label,description';
$sql .= ' FROM ' . MAIN_DB_PREFIX . 'product_lang';
$sql .= ' WHERE fk_product = ' . $objp->rowid;
$sql .= ' AND lang = "' . $langs->getDefaultLang() . '"';
@@ -500,6 +500,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
if ($resqlm)
{
$objtp = $db->fetch_object($resqlm);
+ if (!empty($objtp->description)) $objp->description = $objtp->description;
if (!empty($objtp->label)) $objp->label = $objtp->label;
}
}
@@ -557,7 +558,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
print ''.$prod->getNomUrl(1, '').' | ';
- print '' . $objp->label . ' | ';
+ print '' . $objp->label . ' | ';
if (!empty($conf->service->enabled) && $type == 1)
{