lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14618 from TobiasSekan/ShowNumAndClickWarehouseArea

Browse Source 
NEW Show header number and make it clickable in warehouse area
This commit is contained in:
Laurent Destailleur 2020-09-03 12:23:45 +02:00 committed by GitHub
commit f88d2bdbbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/product/stock/index.php
View File

@ -3,6 +3,7 @@
* Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com> * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2019 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2019 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2020 Tobias Sekan <tobias.sekan@startmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -75,7 +76,7 @@ $max = 15;
$sql = "SELECT e.rowid, e.ref as label, e.lieu, e.statut as status"; $sql = "SELECT e.rowid, e.ref as label, e.lieu, e.statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e"; $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
$sql .= " WHERE e.statut in (0,1)"; $sql .= " WHERE e.statut in (".Entrepot::STATUS_CLOSED.",".Entrepot::STATUS_OPEN_ALL.")";
$sql .= " AND e.entity IN (".getEntity('stock').")"; $sql .= " AND e.entity IN (".getEntity('stock').")";
$sql .= $db->order('e.statut', 'DESC'); $sql .= $db->order('e.statut', 'DESC');
$sql .= $db->plimit($max + 1, 0); $sql .= $db->plimit($max + 1, 0);
@ -86,12 +87,20 @@ if ($result)
{ {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0;
print '<div class="div-table-responsive-no-min">'; print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">'; print '<table class="noborder centpercent">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Warehouses").'</th></tr>'; print '<tr class="liste_titre">';
print '<th colspan="2">';
print $langs->trans("Warehouses").' ';
print '<a href="'.DOL_URL_ROOT.'/product/stock/list.php">';
// TODO: "search_status" on "/product/stock/list.php" currently only accept a single integer value
//print '<a href="'.DOL_URL_ROOT.'/product/stock/list.php?search_status='.Entrepot::STATUS_CLOSED.','.Entrepot::STATUS_OPEN_ALL.'">';
print '<span class="badge">'.$num.'</span>';
print '</a>';
print '</th>';
print '</tr>';
$i = 0;
if ($num) if ($num)
{ {
while ($i < min($max, $num)) while ($i < min($max, $num))
@ -114,6 +123,8 @@ if ($result)
$i++; $i++;
} }
$db->free($result); $db->free($result);
} else {
print '<tr><td>'.$langs->trans("None").'</td><td></td></tr>';
} }
if ($num > $max) { if ($num > $max) {
print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td></tr>'; print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td></tr>';
@ -141,7 +152,7 @@ $sql .= ", ".MAIN_DB_PREFIX."product as p";
$sql .= " WHERE m.fk_product = p.rowid"; $sql .= " WHERE m.fk_product = p.rowid";
$sql .= " AND m.fk_entrepot = e.rowid"; $sql .= " AND m.fk_entrepot = e.rowid";
$sql .= " AND e.entity IN (".getEntity('stock').")"; $sql .= " AND e.entity IN (".getEntity('stock').")";
if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0"; if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = ".Product::TYPE_PRODUCT;
$sql .= $db->order("datem", "DESC"); $sql .= $db->order("datem", "DESC");
$sql .= $db->plimit($max, 0); $sql .= $db->plimit($max, 0);