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

Clean code for inventory

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-20 02:07:47 +01:00
parent 62b9fbb67f
commit 206cfcd7fe
6 changed files with 116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/mysql/tables/llx_inventorydet.sql
View File

@ -26,8 +26,8 @@ fk_inventory integer DEFAULT 0,
fk_warehouse integer DEFAULT 0,
fk_product integer DEFAULT 0,
batch varchar(30) DEFAULT NULL, -- Lot or serial number
qty_view double DEFAULT NULL, -- must be filled once regulation is done
qty_stock double DEFAULT NULL, -- can be filled during draft edition
qty_stock double DEFAULT NULL, -- The targeted value. can be filled during draft edition
qty_view double DEFAULT NULL, -- must be filled once regulation is done
qty_regulated double DEFAULT NULL -- must be filled once regulation is done
)
ENGINE=InnoDB;

1
htdocs/langs/en_US/stocks.lang
View File

@ -193,6 +193,7 @@ TheoricalQty=Theorique qty
TheoricalValue=Theorique qty
LastPA=Last BP
CurrentPA=Curent BP
RecordedQty=Recorded Qty
RealQty=Real Qty
RealValue=Real Value
RegulatedQty=Regulated Qty

2
htdocs/product/inventory/card.php
View File

@ -302,7 +302,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<div class="fichecenter">';
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">'."\n";
print '<table class="border centpercent tableforfield">'."\n";
// Common attributes
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';

5
htdocs/product/inventory/class/inventory.class.php
View File

@ -124,6 +124,11 @@ class Inventory extends CommonObject
*/
public $fk_warehouse;
/**
* @var int ID
*/
public $fk_product;
public $date_inventory;
public $title;

109
htdocs/product/inventory/inventory.php
View File

@ -242,7 +242,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '<div class="fichecenter">';
print '<div class="fichehalfleft">';
print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent">'."\n";
print '<table class="border centpercent tableforfield">'."\n";
// Common attributes
include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
@ -295,7 +295,112 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print '</div>'."\n";
}
include DOL_DOCUMENT_ROOT.'/product/inventory/tpl/inventory.tpl.php';
print '<div class="fichecenter">';
print '<div class="fichehalfleft">';
print '<div class="clearboth"></div>';
//print load_fiche_titre($langs->trans('Consumption'), '', '');
print '<div class="div-table-responsive-no-min">';
print '<table id="tablelines" class="noborder noshadow centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Warehouse").'</td>';
print '<td>'.$langs->trans("Product").'</td>';
if ($conf->productbatch->enabled) {
print '<td>';
print $langs->trans("Batch");
print '</td>';
}
print '<td class="right">'.$langs->trans("RecordedQty").'</td>';
print '<td class="right">'.$langs->trans("RealQty").'</td>';
print '<td>';
print '</td>';
print '</tr>';
$sql = 'SELECT ps.rowid, ps.fk_entrepot as fk_warehouse, ps.fk_product';
$sql .= ' FROM '.MAIN_DB_PREFIX.'product_stock as ps, '.MAIN_DB_PREFIX.'product as p, '.MAIN_DB_PREFIX.'entrepot as e';
$sql .= ' WHERE p.entity IN ('.getEntity('product').')';
$sql .= ' AND ps.fk_product = p.rowid AND ps.fk_entrepot = e.rowid';
if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
if ($object->fk_product > 0) $sql .= ' AND ps.fk_product = '.$object->fk_product;
if ($object->fk_warehouse > 0) $sql .= ' AND ps.fk_entrepot = '.$object->fk_warehouse;
$cacheOfProducts = array();
$cacheOfWarehouses = array();
$resql = $db->query($sql);
if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
$totalarray = array();
while ($i < $num)
{
$obj = $db->fetch_object($resql);
if (is_object($cacheOfWarehouses[$obj->fk_warehouse])) {
$warehouse_static = $cacheOfWarehouses[$obj->fk_warehouse];
} else {
$warehouse_static = new Entrepot($db);
$warehouse_static->fetch($obj->fk_warehouse);
$cacheOfWarehouses[$warehouse_static->id] = $warehouse_static;
}
if (is_object($cacheOfProducts[$obj->fk_product])) {
$product_static = $cacheOfProducts[$obj->fk_product];
} else {
$product_static = new Product($db);
$product_static->fetch($obj->fk_product);
$option = 'nobatch';
$option .= ',novirtual';
$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
$cacheOfProducts[$product_static->id] = $product_static;
}
print '<tr class="oddeven">';
print '<td>';
print $warehouse_static->getNomUrl(1);
print '</td>';
print '<td>';
print $product_static->getNomUrl(1);
print '</td>';
if ($conf->productbatch->enabled) {
print '<td>';
print '';
print '</td>';
}
print '<td>';
print '';
print '</td>';
print '<td>';
print '';
print '</td>';
print '<td>';
print '';
print '</td>';
print '</tr>';
$i++;
}
} else {
dol_print_error($db);
}
print '</table>';
print '</div>';
print '</div>';
print '</div>';
}
// End of page

14
htdocs/product/inventory/tpl/inventory.tpl.php
View File

@ -1,14 +0,0 @@
<?php
// Protection to avoid direct call of template
if (empty($conf) || ! is_object($conf))
{
print "Error, template page can't be called as URL";
exit;
}
?>
TODO...