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

NEW add field list if reception

Browse Source
This commit is contained in:
atm-quentin 2018-10-11 17:30:14 +02:00
parent 83e4d6bd13
commit 3e29b11890
2 changed files with 10 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,11 +744,12 @@ if ($id > 0 || ! empty($ref)) {
// List of lines already dispatched
$sql = "SELECT p.ref, p.label,";
$sql .= " e.rowid as warehouse_id, e.label as entrepot,";
$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status";
if($conf->reception->enabled)$sql.=" ,cfd.fk_reception";
$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.datec";
if($conf->reception->enabled)$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 .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e ON cfd.fk_entrepot = e.rowid";
if($conf->reception->enabled)$sql.=" LEFT JOIN " . MAIN_DB_PREFIX . "reception as r ON cfd.fk_reception = r.rowid";
$sql .= " WHERE cfd.fk_commande = " . $object->id;
$sql .= " AND cfd.fk_product = p.rowid";
$sql .= " ORDER BY cfd.rowid ASC";
@ -768,7 +769,10 @@ if ($id > 0 || ! empty($ref)) {
print '<tr class="liste_titre">';
if($conf->reception->enabled)print '<td>' . $langs->trans("Reception") . '</td>';
print '<td>' . $langs->trans("Product") . '</td>';
print '<td>' . $langs->trans("DateCreation") . '</td>';
print '<td>' . $langs->trans("DateDeliveryPlanned") . '</td>';
if (! empty($conf->productbatch->enabled)) {
print '<td>' . $langs->trans("batch_number") . '</td>';
print '<td>' . $langs->trans("EatByDate") . '</td>';
@ -807,6 +811,8 @@ if ($id > 0 || ! empty($ref)) {
print '<a href="' . DOL_URL_ROOT . '/product/fournisseurs.php?id=' . $objp->fk_product . '">' . img_object($langs->trans("ShowProduct"), 'product') . ' ' . $objp->ref . '</a>';
print ' - ' . $objp->label;
print "</td>\n";
print '<td>'.dol_print_date($db->jdate($objp->datec),'day').'</td>';
print '<td>'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>';
if (! empty($conf->productbatch->enabled)) {
print '<td>' . $objp->batch . '</td>';

53
htdocs/reception/class/reception.class.php
View File

@ -73,11 +73,7 @@ class Reception extends CommonObject
var $trueSize;
var $date_delivery; // Date delivery planed
/**
* @deprecated
* @see date_reception
*/
var $date;
/**
* Effective delivery date
@ -355,52 +351,7 @@ class Reception extends CommonObject
}
}
/**
* Create the detail (eat-by date) of the reception line
*
* @param object $line_ext full line informations
* @param array $array_options extrafields array
* @return int <0 if KO, >0 if OK
*/
function create_line_batch($line_ext,$array_options=0)
{
$error = 0;
$stockLocationQty = array(); // associated array with batch qty in stock location
$tab=$line_ext->detail_batch;
// create stockLocation Qty array
foreach ($tab as $detbatch)
{
if ($detbatch->entrepot_id)
{
$stockLocationQty[$detbatch->entrepot_id] += $detbatch->dluo_qty;
}
}
// create reception lines
foreach ($stockLocationQty as $stockLocation => $qty)
{
if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
{
$error++;
}
else
{
// create reception batch lines for stockLocation
foreach ($tab as $detbatch)
{
if ($detbatch->entrepot_id == $stockLocation){
if (! ($detbatch->create($line_id) >0)) // Create an receptionlinebatch
{
$error++;
}
}
}
}
}
if (! $error) return 1;
else return -1;
}
/**
* Get object and lines from database