Fix column conditions
This commit is contained in:
parent
e85fef5012
commit
ef204b2620
@ -735,9 +735,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
print $langs->trans("Warehouse");
|
print $langs->trans("Warehouse");
|
||||||
}
|
}
|
||||||
print '</td>';
|
print '</td>';
|
||||||
if ($conf->productbatch->enabled) {
|
if ($conf->stock->enabled) {
|
||||||
// Available
|
// Available
|
||||||
print '<td>';
|
print '<td align="right">';
|
||||||
if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
|
if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
|
||||||
print $langs->trans("Stock");
|
print $langs->trans("Stock");
|
||||||
}
|
}
|
||||||
@ -958,12 +958,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Lot Batch
|
// Lot Batch
|
||||||
print '<td>';
|
if ($conf->productbatch->enabled) {
|
||||||
if ($line2['batch'] != '') {
|
print '<td>';
|
||||||
$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
|
if ($line2['batch'] != '') {
|
||||||
print $tmpbatch->getNomUrl(1);
|
$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
|
||||||
|
print $tmpbatch->getNomUrl(1);
|
||||||
|
}
|
||||||
|
print '</td>';
|
||||||
}
|
}
|
||||||
print '</td>';
|
|
||||||
|
|
||||||
// Action delete line
|
// Action delete line
|
||||||
if ($permissiontodelete) {
|
if ($permissiontodelete) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user