Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27528 from altairisfr/rdb

Browse Source 
[DATA_MODEL] rename commande_fournisseur_dispatch into receptiondet_batch
This commit is contained in:
Laurent Destailleur
2024-03-17 21:31:27 +01:00
committed by GitHub
parent 90ecb139b3 a2ae40e62a
commit ebba438fbe
25 changed files with 60 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/fourn/commande/dispatch.php
View File

@@ -668,7 +668,7 @@ if ($id > 0 || !empty($ref)) {
// Set $products_dispatched with qty dispatched for each product id
$products_dispatched = array();
$sql = "SELECT l.rowid, cfd.fk_product, sum(cfd.qty) as qty";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
$sql .= " FROM ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as l on l.rowid = cfd.fk_commandefourndet";
$sql .= " WHERE cfd.fk_commande = ".((int) $object->id);
$sql .= " GROUP BY l.rowid, cfd.fk_product";
@@ -1171,7 +1171,7 @@ if ($id > 0 || !empty($ref)) {
$sql .= " ,cfd.fk_reception, r.date_delivery";
}
$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
$sql .= " ".MAIN_DB_PREFIX."receptiondet_batch as cfd";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
if ($conf->reception->enabled) {