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

ADD : info of number of product still to dispatched in a supplier order

Browse Source
This commit is contained in:
Benjamin Chantalat 2021-10-10 20:50:51 +02:00
parent 1b504b3e2c
commit 65c0167d07
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/fourn.lib.php
View File

@ -157,8 +157,12 @@ function ordersupplier_prepare_head($object)
if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) { if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
$langs->load("stocks"); $langs->load("stocks");
$nbLineToDispatch = count($object->getNotCompletlyDispatchedLines());
$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id; $head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
$head[$h][1] = $langs->trans("OrderDispatch"); $head[$h][1] = $langs->trans("OrderDispatch");
if ($nbLineToDispatch > 0) {
$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbLineToDispatch.'</span>';
}
$head[$h][2] = 'dispatch'; $head[$h][2] = 'dispatch';
$h++; $h++;
} }

43
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -2274,6 +2274,49 @@ class CommandeFournisseur extends CommonOrder
return $ret; return $ret;
} }
/**
* Return array of the lines that are waiting to be dispatched
*
* @return array Array of lines
*/
public function getNotCompletlyDispatchedLines()
{
$ret = array();
$sql = "SELECT supplierOrderDet.fk_product as product_id, supplierOrderDet.qty as qty_ordered, supplierOrderDet.fk_commande,";
$sql .= " dispatch.rowid as dispatchedlineid, sum(dispatch.qty) as qty_dispatched";
$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as supplierOrderDet";
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as dispatch ON supplierOrderDet.rowid = dispatch.fk_commandefourndet";
$sql .= " WHERE supplierOrderDet.fk_commande = ".$this->id;
$sql .= " GROUP BY supplierOrderDet.fk_product";
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
$i = 0;
while ($i < $num) {
$objp = $this->db->fetch_object($resql);
if ($objp) {
// If product not completly dispatched
if (is_null($objp->qty_dispatched) OR ($objp->qty_dispatched < $objp->qty_ordered)){
$ret[] = array(
'product_id' => $objp->product_id,
'qty_ordered' => $objp->qty_ordered,
'qty_dispatched' => $objp->qty_dispatched,
);
}
}
$i++;
}
} else {
dol_print_error($this->db, 'Failed to execute request to get not completly dispatched lines');
}
return $ret;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**