Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NEW shipment kits with dispatcher v2 #716

Draft
wants to merge 2 commits into
base: 2024_rc
Choose a base branch
from
Draft

NEW shipment kits with dispatcher v2 #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8293fc
NEW shipment kits with dispatcher v2
lvessiller-opendsi Jan 26, 2024
90399fb
Resolve conflicts
lvessiller-opendsi Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion htdocs/admin/stock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,16 @@


$disabled = '';
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS') || isModEnabled('productbatch')) {
$disabled = ' disabled';
}
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
$langs->load('products');
print info_admin($langs->trans('WhenProductVirtualOnOptionAreForced'));
}
if (isModEnabled('productbatch')) {
// If module lot/serial enabled, we force the inc/dec mode to STOCK_CALCULATE_ON_SHIPMENT_CLOSE and STOCK_CALCULATE_ON_RECEPTION_CLOSE
$langs->load("productbatch");
$disabled = ' disabled';

// STOCK_CALCULATE_ON_SHIPMENT_CLOSE
$descmode = $langs->trans('DeStockOnShipmentOnClosing');
Expand Down
89 changes: 77 additions & 12 deletions htdocs/expedition/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,14 @@
} else {
// batch mode
if ($batch_line[$i]['qty'] > 0 || ($batch_line[$i]['qty'] == 0 && getDolGlobalString('SHIPMENT_GETS_ALL_ORDER_PRODUCTS'))) {
$ret = $object->addline_batch($batch_line[$i], $array_options[$i]);
$origin_line_id = (int) $batch_line[$i]['ix_l'];
$origin_line = new OrderLine($db);
$res = $origin_line->fetch($origin_line_id);
if ($res <= 0) {
$error++;
setEventMessages($origin_line->error, $origin_line->errors, 'errors');
}
$ret = $object->addline_batch($batch_line[$i], $array_options[$i], $origin_line);
if ($ret < 0) {
setEventMessages($object->error, $object->errors, 'errors');
$error++;
Expand Down Expand Up @@ -2299,6 +2306,8 @@
print '<tbody>';

// Loop on each product to send/sent
$conf->cache['product'] = array();
$conf->cache['warehouse'] = array();
for ($i = 0; $i < $num_prod; $i++) {
$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => !empty($editColspan) ? $editColspan : 0, 'outputlangs' => $outputlangs);
$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
Expand All @@ -2319,8 +2328,13 @@
if ($lines[$i]->fk_product > 0) {
// Define output language
if (getDolGlobalInt('MAIN_MULTILANGS') && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
$prod = new Product($db);
$prod->fetch($lines[$i]->fk_product);
$product_id = $lines[$i]->fk_product;
if (empty($conf->cache['product'][$product_id])) {
$prod = new Product($db);
$prod->fetch($product_id);
} else {
$prod = $conf->cache['product'][$product_id];
}
$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
} else {
$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
Expand Down Expand Up @@ -2509,20 +2523,56 @@
// Warehouse source
if (isModEnabled('stock')) {
print '<td class="linecolwarehousesource left">';
if ($lines[$i]->entrepot_id > 0 && $lines[$i]->stockable_product == Product::ENABLED_STOCK) {
$entrepot = new Entrepot($db);
$entrepot->fetch($lines[$i]->entrepot_id);
print $entrepot->getNomUrl(1);
if ($lines[$i]->entrepot_id > 0 && $lines[$i]->product->stockable_product == Product::ENABLED_STOCK) {
$warehouse_id = $lines[$i]->entrepot_id;
if (empty($conf->cache['warehouse'][$warehouse_id])) {
$warehouse = new Entrepot($db);
$warehouse->fetch($warehouse_id);
} else {
$warehouse = $conf->cache['warehouse'][$warehouse_id];
}
print $warehouse->getNomUrl(1);
} elseif (count($lines[$i]->details_entrepot) > 1) {
$detail = '';
foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
if ($detail_entrepot->entrepot_id > 0) {
$entrepot = new Entrepot($db);
$entrepot->fetch($detail_entrepot->entrepot_id);
$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->label, $detail_entrepot->qty_shipped).'<br>';
$warehouse_id = $detail_entrepot->entrepot_id;
if ($warehouse_id > 0) {
if (empty($conf->cache['warehouse'][$warehouse_id])) {
$warehouse = new Entrepot($db);
$warehouse->fetch($warehouse_id);
} else {
$warehouse = $conf->cache['warehouse'][$warehouse_id];
}
$detail .= $langs->trans("DetailWarehouseFormat", $warehouse->label, $detail_entrepot->qty_shipped).'<br>';
}
}
print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans("DetailWarehouseNumber"), $detail);
} elseif (count($lines[$i]->detail_children) > 1) {
$detail = '';
foreach ($lines[$i]->detail_children as $child_product_id => $child_stock_list) {
foreach ($child_stock_list as $warehouse_id => $total_qty) {
// get product from cache
$child_product_label = '';
if (empty($conf->cache['product'][$child_product_id])) {
$child_product = new Product($db);
$child_product->fetch($child_product_id);
} else {
$child_product = $conf->cache['product'][$child_product_id];
}
$child_product_label = $child_product->ref . ' ' . $child_product->label;

// get warehouse from cache
if (empty($conf->cache['warehouse'][$warehouse_id])) {
$child_warehouse = new Entrepot($db);
$child_warehouse->fetch($warehouse_id);
} else {
$child_warehouse = $conf->cache['warehouse'][$warehouse_id];
}

$detail .= $langs->trans('DetailChildrenFormat', $child_product_label, $child_warehouse->label, $total_qty).'<br>';
}
}
print $form->textwithtooltip(img_picto('', 'object_stock').' '.$langs->trans('DetailWarehouseNumber'), $detail);
}
print '</td>';
}
Expand Down Expand Up @@ -2583,9 +2633,24 @@
print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
print '</td>';
} elseif ($object->statut == Expedition::STATUS_DRAFT) {
$edit_url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id;
if (getDolGlobalInt('PRODUIT_SOUSPRODUITS')) {
$product_id = $lines[$i]->fk_product;
if (empty($conf->cache['product'][$product_id])) {
$product = new Product($db);
$product->fetch($product_id);
} else {
$product = $conf->cache['product'][$product_id];
}

if ($product->hasFatherOrChild(1)) {
$edit_url = dol_buildpath('/expedition/dispatch.php?id='.$object->id, 1);
}
}

// edit-delete buttons
print '<td class="linecoledit center">';
print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
print '<a class="editfielda reposition" href="'.$edit_url.'">'.img_edit().'</a>';
print '</td>';
print '<td class="linecoldelete" width="10">';
print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deleteline&token='.newToken().'&lineid='.$lines[$i]->id.'">'.img_delete().'</a>';
Expand Down
Loading