';
$label .= '
'.$langs->trans('Batch').': '.$this->batch;
- if ($this->eatby)
- {
+ if ($this->eatby && empty($conf->global->PRODUCT_DISABLE_EATBY)) {
$label .= '
'.$langs->trans('EatByDate').': '.dol_print_date($this->eatby, 'day');
}
- if ($this->sellby)
- {
+ if ($this->sellby && empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
$label .= '
'.$langs->trans('SellByDate').': '.dol_print_date($this->sellby, 'day');
}
@@ -602,9 +600,17 @@ class Productlot extends CommonObject
$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
- $linkstart = '
';
- $linkend = '';
+ if ($option == 'nolink') {
+ $linkend = '';
+ } else {
+ $linkend = '';
+ }
$result .= $linkstart;
if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 1c93d1ee943..8a4d81419c4 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -28,6 +28,7 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
$hookmanager = new HookManager($db);
@@ -170,17 +171,19 @@ if ($resql)
if (!empty($conf->productbatch->enabled))
{
print '
'.$langs->trans("Batch").' | ';
- if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+ /*if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print '
'.$langs->trans("SellByDate").' | ';
}
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
print '
'.$langs->trans("EatByDate").' | ';
- }
+ }*/
}
print '
'.$langs->trans("Warehouse").' | ';
print '
'.$langs->trans("FullList").' | ';
print "\n";
+ $tmplotstatic = new Productlot($db);
+
$i = 0;
while ($i < min($num, $max))
{
@@ -198,20 +201,25 @@ if ($resql)
$warehouse->label = $objp->warehouse_label;
$warehouse->lieu = $objp->lieu;
+ $tmplotstatic->batch = $objp->batch;
+ $tmplotstatic->sellby = $objp->sellby;
+ $tmplotstatic->eatby = $objp->eatby;
+
print '
';
print '| '.dol_print_date($db->jdate($objp->datem), 'dayhour').' | ';
print '';
print $producttmp->getNomUrl(1);
print " | \n";
- if (!empty($conf->productbatch->enabled))
- {
- print ''.$objp->batch.' | ';
- if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+ if (!empty($conf->productbatch->enabled)) {
+ print '';
+ print $tmplotstatic->getNomUrl(0, 'nolink');
+ print ' | ';
+ /*if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
print ''.dol_print_date($db->jdate($objp->sellby), 'day').' | ';
}
if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
print ''.dol_print_date($db->jdate($objp->eatby), 'day').' | ';
- }
+ }*/
}
print '';
print $warehouse->getNomUrl(1);
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index d39e7a3e1b5..987865e8f0e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -621,7 +621,7 @@ textarea.centpercent {
}
.flip {
- transform: scaleX(-1);
+ transform: scaleX(-1) translate(2px, 0);
}
.center {
text-align: center;
|