| '; -print ' | '; -print ' | '; +print ' | '; +print ' | '; if (!empty($conf->service->enabled) && $type == 1) print ' | '; print ' | '; print ' | '; diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php index 688307fbc13..ef8639787b7 100644 --- a/htdocs/product/stock/replenishorders.php +++ b/htdocs/product/stock/replenishorders.php @@ -47,7 +47,7 @@ $snom = GETPOST('search_nom', 'alpha'); $suser = GETPOST('search_user', 'alpha'); $sttc = GETPOST('search_ttc', 'alpha'); $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int'); -$sproduct = GETPOST('sproduct', 'int'); +$search_product = GETPOST('search_product', 'int'); $search_dateyear = GETPOST('search_dateyear', 'int'); $search_datemonth = GETPOST('search_datemonth', 'int'); $search_dateday = GETPOST('search_dateday', 'int'); @@ -78,7 +78,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x' $search_datemonth = ''; $search_dateday = ''; $search_dateyear = ''; - $sproduct = 0; + $search_product = 0; } @@ -143,7 +143,7 @@ if (GETPOST('statut', 'int')) { $sql .= ' GROUP BY cf.rowid, cf.ref, cf.date_creation, cf.fk_statut'; $sql .= ', cf.total_ttc, cf.fk_user_author, u.login, s.rowid, s.nom'; $sql .= $db->order($sortfield, $sortorder); -if (!$sproduct) { +if (!$search_product) { $sql .= $db->plimit($limit + 1, $offset); } @@ -261,11 +261,11 @@ if ($resql) $userstatic = new User($db); - while ($i < min($num, $sproduct ? $num : $conf->liste_limit)) + while ($i < min($num, $search_product ? $num : $conf->liste_limit)) { $obj = $db->fetch_object($resql); - $showline = dolDispatchToDo($obj->rowid) && (!$sproduct || in_array($sproduct, getProducts($obj->rowid))); + $showline = dolDispatchToDo($obj->rowid) && (!$search_product || in_array($search_product, getProducts($obj->rowid))); if ($showline) { diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php index f3482e22098..2e1a418c732 100644 --- a/htdocs/product/stock/stockatdate.php +++ b/htdocs/product/stock/stockatdate.php @@ -53,8 +53,10 @@ $action = GETPOST('action', 'alpha'); $type = GETPOST('type', 'int'); $mode = GETPOST('mode', 'alpha'); $date = ''; +$dateendofday = ''; if (GETPOSTISSET('dateday') && GETPOSTISSET('datemonth') && GETPOSTISSET('dateyear')) { $date = dol_mktime(0, 0, 0, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int')); + $dateendofday = dol_mktime(23, 59, 59, GETPOST('datemonth', 'int'), GETPOST('dateday', 'int'), GETPOST('dateyear', 'int')); } $productid = GETPOST('productid', 'int'); @@ -98,7 +100,7 @@ if ($conf->global->ENTREPOT_EXTRA_STATUS) { } -// Get array with amount in stock per product, warehouse +// Get array with current stock per product, warehouse $stock_prod_warehouse = array(); $stock_prod = array(); if ($date) { // Avoid heavy sql if mandatory date is not defined @@ -107,7 +109,6 @@ if ($date) { // Avoid heavy sql if mandatory date is not defined $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps"; $sql .= ", ".MAIN_DB_PREFIX."entrepot as w"; $sql .= " WHERE w.entity IN (".getEntity('stock').")"; - //$sql .= " AND p.entity IN (".getEntity('product').")"; $sql .= " AND w.rowid = ps.fk_entrepot"; if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) { $sql .= " AND w.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")"; @@ -115,6 +116,9 @@ if ($date) { // Avoid heavy sql if mandatory date is not defined if ($productid > 0) { $sql .= " AND ps.fk_product = ".$productid; } + if ($fk_warehouse > 0) { + $sql .= " AND ps.fk_entrepot = ".$fk_warehouse; + } $sql .= " GROUP BY fk_product, fk_entrepot"; //print $sql; @@ -137,6 +141,8 @@ if ($date) { // Avoid heavy sql if mandatory date is not defined $i++; } + + $db->free($resql); } else { @@ -145,6 +151,63 @@ if ($date) { // Avoid heavy sql if mandatory date is not defined //var_dump($stock_prod_warehouse); } +// Get array with list of stock movements between date and now (for product/warehouse= +$movements_prod_warehouse = array(); +$movements_prod = array(); +if ($date) { + $sql = "SELECT sm.fk_product, sm.fk_entrepot, SUM(sm.value) AS stock"; + $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as sm"; + $sql .= ", ".MAIN_DB_PREFIX."entrepot as w"; + $sql .= " WHERE w.entity IN (".getEntity('stock').")"; + $sql .= " AND w.rowid = sm.fk_entrepot"; + if (! empty($conf->global->ENTREPOT_EXTRA_STATUS) && count($warehouseStatus)) { + $sql .= " AND w.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")"; + } + if ($mode == 'future') { + $sql .= " AND sm.datem <= '".$db->idate($dateendofday)."'"; + } else { + $sql .= " AND sm.datem >= '".$db->idate($date)."'"; + } + if ($productid > 0) { + $sql .= " AND sm.fk_product = ".$productid; + } + if ($fk_warehouse > 0) { + $sql .= " AND sm.fk_entrepot = ".$fk_warehouse; + } + $sql .= " GROUP BY sm.fk_product, sm.fk_entrepot"; + $resql = $db->query($sql); + + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; + + while($i < $num) + { + $obj = $db->fetch_object($resql); + $fk_product = $obj->fk_product; + $fk_entrepot = $obj->fk_entrepot; + $stock = $obj->stock; + + // Pour llx_product_stock.reel + $movements_prod_warehouse[$fk_product][$fk_entrepot] = $stock; + + // Pour llx_product.stock + $movements_prod[$fk_product] += $stock; + + $i++; + } + + $db->free($resql); + } + else + { + dol_print_error($db); + } +} +//var_dump($movements_prod_warehouse); +//var_dump($movements_prod); + /* * View @@ -189,89 +252,17 @@ if ($fk_warehouse > 0) { $sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,'; $sql .= ' p.tms, p.duration, p.tobuy, p.stock'; } -/* -if ($usevirtualstock) -{ - if (!empty($conf->commande->enabled)) { - $sqlCommandesCli = "(SELECT ".$db->ifsql("SUM(cd1.qty) IS NULL", "0", "SUM(cd1.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlCommandesCli .= " FROM ".MAIN_DB_PREFIX."commandedet as cd1, ".MAIN_DB_PREFIX."commande as c1"; - $sqlCommandesCli .= " WHERE c1.rowid = cd1.fk_commande AND c1.entity IN (".getEntity('commande').")"; - $sqlCommandesCli .= " AND cd1.fk_product = p.rowid"; - $sqlCommandesCli .= " AND c1.fk_statut IN (1,2))"; - } else { - $sqlCommandesCli = '0'; - } - - if (!empty($conf->expedition->enabled)) { - $sqlExpeditionsCli = "(SELECT ".$db->ifsql("SUM(ed2.qty) IS NULL", "0", "SUM(ed2.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlExpeditionsCli .= " FROM ".MAIN_DB_PREFIX."expedition as e2,"; - $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."expeditiondet as ed2,"; - $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commande as c2,"; - $sqlExpeditionsCli .= " ".MAIN_DB_PREFIX."commandedet as cd2"; - $sqlExpeditionsCli .= " WHERE ed2.fk_expedition = e2.rowid AND cd2.rowid = ed2.fk_origin_line AND e2.entity IN (".getEntity('expedition').")"; - $sqlExpeditionsCli .= " AND cd2.fk_commande = c2.rowid"; - $sqlExpeditionsCli .= " AND c2.fk_statut IN (1,2)"; - $sqlExpeditionsCli .= " AND cd2.fk_product = p.rowid"; - $sqlExpeditionsCli .= " AND e2.fk_statut IN (1,2))"; - } else { - $sqlExpeditionsCli = '0'; - } - - if (!empty($conf->fournisseur->enabled)) { - $sqlCommandesFourn = "(SELECT ".$db->ifsql("SUM(cd3.qty) IS NULL", "0", "SUM(cd3.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlCommandesFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd3,"; - $sqlCommandesFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur as c3"; - $sqlCommandesFourn .= " WHERE c3.rowid = cd3.fk_commande"; - $sqlCommandesFourn .= " AND c3.entity IN (".getEntity('supplier_order').")"; - $sqlCommandesFourn .= " AND cd3.fk_product = p.rowid"; - $sqlCommandesFourn .= " AND c3.fk_statut IN (3,4))"; - - $sqlReceptionFourn = "(SELECT ".$db->ifsql("SUM(fd4.qty) IS NULL", "0", "SUM(fd4.qty)")." as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlReceptionFourn .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf4,"; - $sqlReceptionFourn .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd4"; - $sqlReceptionFourn .= " WHERE fd4.fk_commande = cf4.rowid AND cf4.entity IN (".getEntity('supplier_order').")"; - $sqlReceptionFourn .= " AND fd4.fk_product = p.rowid"; - $sqlReceptionFourn .= " AND cf4.fk_statut IN (3,4))"; - } else { - $sqlCommandesFourn = '0'; - $sqlReceptionFourn = '0'; - } - - if (!empty($conf->mrp->enabled)) { - $sqlProductionToConsume = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlProductionToConsume .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,"; - $sqlProductionToConsume .= " ".MAIN_DB_PREFIX."mrp_production as mp5"; - $sqlProductionToConsume .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity('mo').")"; - $sqlProductionToConsume .= " AND mp5.fk_product = p.rowid"; - $sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consummed')"; - $sqlProductionToConsume .= " AND mm5.status IN (1,2))"; - - $sqlProductionToProduce = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toproduce'", 'mp5.qty', '- mp5.qty').") IS NULL", "0", "SUM(".$db->ifsql("mp5.role = 'toconsume'", 'mp5.qty', '- mp5.qty').")").") as qty"; // We need the ifsql because if result is 0 for product p.rowid, we must return 0 and not NULL - $sqlProductionToProduce .= " FROM ".MAIN_DB_PREFIX."mrp_mo as mm5,"; - $sqlProductionToProduce .= " ".MAIN_DB_PREFIX."mrp_production as mp5"; - $sqlProductionToProduce .= " WHERE mm5.rowid = mp5.fk_mo AND mm5.entity IN (".getEntity('mo').")"; - $sqlProductionToProduce .= " AND mp5.fk_product = p.rowid"; - $sqlProductionToProduce .= " AND mp5.role IN ('toproduce', 'produced')"; - $sqlProductionToProduce .= " AND mm5.status IN (1,2))"; - } else { - $sqlProductionToConsume = '0'; - $sqlProductionToProduce = '0'; - } - - if ($salert == 'on') // Option to see when stock is lower than alert - { - $sql .= ' AND ('; - $sql .= $sqlalertstock.' >= 0 AND ('.$sqlalertstock.' > SUM('.$db->ifsql("s.reel IS NULL", "0", "s.reel").')'; - $sql .= ' - ('.$sqlCommandesCli.' - '.$sqlExpeditionsCli.') + ('.$sqlCommandesFourn.' - '.$sqlReceptionFourn.') + ('.$sqlProductionToProduce.' - '.$sqlProductionToConsume.'))'; - $sql .= ')'; - } -} -*/ // Add where from hooks $parameters = array(); $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook $sql .= $hookmanager->resPrint; +if ($sortfield == 'stock_reel' && $fk_warehouse <= 0) { + $sortfield = 'stock'; +} +if ($sortfield == 'stock' && $fk_warehouse > 0) { + $sortfield = 'stock_reel'; +} $sql .= $db->order($sortfield, $sortorder); if ($date) { // We avoid a heavy sql if mandatory parameter date not yet defined @@ -358,13 +349,13 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&co if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit); $param .= '&mode='.$mode; if ($fk_warehouse > 0) $param .= '&fk_warehouse='.$fk_warehouse; -if ($productid > 0) $param .= '&fk_product='.$productid; +if ($productid > 0) $param .= '&productid='.$productid; if (GETPOST('dateday', 'int') > 0) $param .= '&dateday='.GETPOST('dateday', 'int'); if (GETPOST('datemonth', 'int') > 0) $param .= '&datemonth='.GETPOST('datemonth', 'int'); if (GETPOST('dateyear', 'int') > 0) $param .= '&dateyear='.GETPOST('dateyear', 'int'); // TODO Move this into the title line ? -print_barre_liste('', $page, $_SERVER["PHP_SELF"], $filters, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1); +print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'stock', 0, '', '', $limit, 0, 0, 1); print ' |
| '; -print ' | '; +print ' | '; +print ' | '; +print ' | '; print ' | '; print ' | '; // Fields from hook @@ -405,8 +397,15 @@ if ($fk_warehouse > 0) { print ' | ||
| '.$currentstock.' | '; + if ($mode == 'future') { + // Current stock + print ''.$currentstock.' | '; - // Stock at date - print ''.$stock.' | '; + print ''; + + // Stock at date + print ' | '.$stock.' | '; + } else { + // Stock at date + print ''.$stock.' | '; + + print ''.$langs->trans("Movements").' | '; + + // Current stock + print ''.$currentstock.' | '; + } // Action print ''; |