Skip to content

Commit

Permalink
NEW - Add edit line on MO (#26122)
Browse files Browse the repository at this point in the history 
* Added the possibility of editing lines

* Review code

* add exit

* Add same action

* check Travis

* Travis

* Update mo_production.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
  • Loading branch information
@atm-lucasmantegari @eldy
atm-lucasmantegari and eldy authored Oct 26, 2023
1 parent 990f911 commit 3f75077
Showing 1 changed file with 196 additions and 95 deletions.
291 changes: 196 additions & 95 deletions htdocs/mrp/mo_production.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,17 @@
setEventMessages($object->error, $object->errors, 'errors');
}
}

if ($action == 'confirm_editline' && $permissiontoadd) {
$moline = new MoLine($db);
$res = $moline->fetch(GETPOST('lineid', 'int'));
if ($result > 0) {
$moline->qty = GETPOST('qty_lineProduce', 'int');
$moline->update($user);
header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
exit;
}
}
}


Expand Down Expand Up @@ -728,7 +739,7 @@
print '</div>';
}

if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline', 'addproduceline'))) {
if (in_array($action, array('consumeorproduce', 'consumeandproduceall', 'addconsumeline', 'addproduceline', 'editline'))) {
print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="confirm_'.$action.'">';
Expand Down Expand Up @@ -851,6 +862,11 @@
// SplitAll
print '<td></td>';

//Edit Line
if ($object->status == Mo::STATUS_DRAFT) {
print '<td></td>';
}

print '</tr>';

if ($action == 'addconsumeline') {
Expand Down Expand Up @@ -933,116 +949,186 @@
$alreadyconsumed += $line2['qty'];
}

$suffix = '_'.$line->id;
print '<!-- Line to dispatch '.$suffix.' -->'."\n";
// hidden fields for js function
print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
if ($action == 'editline' && $lineid == $line->id) {
$linecost = price2num($tmpproduct->pmp, 'MT');

print '<tr data-line-id="'.$line->id.'">';
// Product
print '<td>'.$tmpproduct->getNomUrl(1);
print '<br><div class="opacitymedium small tdoverflowmax150" title="'.dol_escape_htmltag($tmpproduct->label).'">'.$tmpproduct->label.'</div>';
print '</td>';
// Qty
print '<td class="right nowraponall">';
$help = ''; $picto = 'help';
if ($line->qty_frozen) {
$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
print $form->textwithpicto('', $help, -1, 'lock').' ';
}
if ($line->disable_stock_change) {
$help = ($help ? '<br>' : '').'<strong>'.$langs->trans("DisableStockChange").'</strong>: '.yn(1).' ('.(($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")).')';
print $form->textwithpicto('', $help, -1, 'help').' ';
}
print price2num($line->qty, 'MS');
print '</td>';
// Cost price
if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
$arrayoflines = $object->fetchLinesLinked('consumed', $line->id);
$alreadyconsumed = 0;
if (is_array($arrayoflines) && !empty($arrayoflines)) {
foreach ($arrayoflines as $line2) {
$alreadyconsumed += $line2['qty'];
}
}
$suffix = '_' . $line->id;
print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
// hidden fields for js function
print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
// Duration - Time spent
print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';
print '<tr>';
print '<input name="lineid" type="hidden" value="' . $line->id . '">';

// Product
print '<td>' . $tmpproduct->getNomUrl(1);
print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</span>';
print '</td>';

// Qty
print '<td class="right nowraponall">';
print price($linecost);
print '<input name="qty_lineProduce" type="number" value="'. $line->qty.'" width="25px">';
print '</td>';
}
// Already consumed
print '<td class="right">';
if ($alreadyconsumed) {
print '<script>';
print 'jQuery(document).ready(function() {
jQuery("#expandtoproduce'.$line->id.'").click(function() {
console.log("Expand mrp_production line '.$line->id.'");
jQuery(".expanddetail'.$line->id.'").toggle();';
if ($nblinetoconsume == $nblinetoconsumecursor) { // If it is the last line
print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
}
print '
});
});';
print '</script>';
if (empty($conf->use_javascript_ajax)) {
print '<a href="'.$_SERVER["PHP_SELF"].'?collapse='.$collapse.','.$line->id.'">';
// Qty consumed
print '<td class="right">';
print ' ' . price2num($alreadyconsumed, 'MS');
print '</td>';
// Entrepot
print '<td class="right">';
print '</td>';
// Stock
print '<td class="nowraponall right">';
if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
print img_warning($langs->trans('StockTooLow')).' ';
}
print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce'.$line->id.'"');
if (empty($conf->use_javascript_ajax)) {
print '</a>';
print '<span class="left">'. $tmpproduct->stock_reel .' </span>';
print '</td>';
// Batch
print '<td class="right">';
print '</td>';

// Action delete line
print '<td>';
print '<input type="submit" class="button buttongen button-add" name="save" value="' . $langs->trans("Edit") . '">';
print '<input type="submit" class="button buttongen button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
print '</td>';

// Action delete line
if ($permissiontodelete) {
print '<td class="center"></td>';
}
print '<td></td>';
print '</tr>';
} else {
if ($nblinetoconsume == $nblinetoconsumecursor) { // If it is the last line
print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
$suffix = '_' . $line->id;
print '<!-- Line to dispatch ' . $suffix . ' -->' . "\n";
// hidden fields for js function
print '<input id="qty_ordered' . $suffix . '" type="hidden" value="' . $line->qty . '">';
print '<input id="qty_dispatched' . $suffix . '" type="hidden" value="' . $alreadyconsumed . '">';

print '<tr data-line-id="' . $line->id . '">';
// Product
print '<td>' . $tmpproduct->getNomUrl(1);
print '<br><div class="opacitymedium small tdoverflowmax150" title="' . dol_escape_htmltag($tmpproduct->label) . '">' . $tmpproduct->label . '</div>';
print '</td>';
// Qty
print '<td class="right nowraponall">';
$help = '';
$picto = 'help';
if ($line->qty_frozen) {
$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("QuantityFrozen") . '</strong>: ' . yn(1) . ' (' . $langs->trans("QuantityConsumedInvariable") . ')';
print $form->textwithpicto('', $help, -1, 'lock') . ' ';
}
}
print ' '.price2num($alreadyconsumed, 'MS');
print '</td>';
// Warehouse
print '<td>';
if (!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) && $tmpwarehouse->id > 0) {
print img_picto('', $tmpwarehouse->picto)." ".$tmpwarehouse->label;
}
print '</td>';
// Stock
if (isModEnabled('stock')) {
print '<td class="nowraponall right">';
if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != Product::TYPE_SERVICE) {
if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
print img_warning($langs->trans('StockTooLow')) . ' ';
if ($line->disable_stock_change) {
$help = ($help ? '<br>' : '') . '<strong>' . $langs->trans("DisableStockChange") . '</strong>: ' . yn(1) . ' (' . (($tmpproduct->type == Product::TYPE_SERVICE && empty($conf->global->STOCK_SUPPORTS_SERVICES)) ? $langs->trans("NoStockChangeOnServices") : $langs->trans("DisableStockChangeHelp")) . ')';
print $form->textwithpicto('', $help, -1, 'help') . ' ';
}
print price2num($line->qty, 'MS');
print '</td>';
// Cost price
if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
print '<td class="right nowraponall">';
print price($linecost);
print '</td>';
}
// Already consumed
print '<td class="right">';
if ($alreadyconsumed) {
print '<script>';
print 'jQuery(document).ready(function() {
jQuery("#expandtoproduce' . $line->id . '").click(function() {
console.log("Expand mrp_production line ' . $line->id . '");
jQuery(".expanddetail' . $line->id . '").toggle();';
if ($nblinetoconsume == $nblinetoconsumecursor) { // If it is the last line
print 'if (jQuery("#tablelines").hasClass("nobottom")) { jQuery("#tablelines").removeClass("nobottom"); } else { jQuery("#tablelines").addClass("nobottom"); }';
}
if (empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) || empty($tmpwarehouse->id)) {
print price2num($tmpproduct->stock_reel, 'MS'); // Available
} else {
// Print only the stock in the selected warehouse
$tmpproduct->load_stock();
$wh_stock = $tmpproduct->stock_warehouse[$tmpwarehouse->id];
if (!empty($wh_stock)) {
print price2num($wh_stock->real, 'MS');
print '
});
});';
print '</script>';
if (empty($conf->use_javascript_ajax)) {
print '<a href="' . $_SERVER["PHP_SELF"] . '?collapse=' . $collapse . ',' . $line->id . '">';
}
print img_picto($langs->trans("ShowDetails"), "chevron-down", 'id="expandtoproduce' . $line->id . '"');
if (empty($conf->use_javascript_ajax)) {
print '</a>';
}
} else {
if ($nblinetoconsume == $nblinetoconsumecursor) { // If it is the last line
print '<script>jQuery("#tablelines").removeClass("nobottom");</script>';
}
}
print ' ' . price2num($alreadyconsumed, 'MS');
print '</td>';
// Warehouse
print '<td>';
if (!empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) && $tmpwarehouse->id > 0) {
print img_picto('', $tmpwarehouse->picto) . " " . $tmpwarehouse->label;
}
print '</td>';
// Stock
if (isModEnabled('stock')) {
print '<td class="nowraponall right">';
if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $tmpproduct->type != Product::TYPE_SERVICE) {
if (!$line->disable_stock_change && $tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
print img_warning($langs->trans('StockTooLow')) . ' ';
}
if (empty($conf->global->STOCK_CONSUMPTION_FROM_MANUFACTURING_WAREHOUSE) || empty($tmpwarehouse->id)) {
print price2num($tmpproduct->stock_reel, 'MS'); // Available
} else {
print "0";
// Print only the stock in the selected warehouse
$tmpproduct->load_stock();
$wh_stock = $tmpproduct->stock_warehouse[$tmpwarehouse->id];
if (!empty($wh_stock)) {
print price2num($wh_stock->real, 'MS');
} else {
print "0";
}
}
}
print '</td>';
}
// Lot
if (isModEnabled('productbatch')) {
print '<td></td>';
}
print '</td>';
}
// Lot
if (isModEnabled('productbatch')) {
print '<td></td>';
}

// Split
print '<td></td>';
// Split
print '<td></td>';

// Split All
print '<td></td>';
// Split All
print '<td></td>';

// Action delete line
if ($permissiontodelete) {
$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id);
print '<td class="center">';
print '<a class="reposition" href="'.$href.'">';
print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
print '</a>';
print '</td>';
}
// Action Edit line
if ($object->status == Mo::STATUS_DRAFT) {
$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
print '<td class="center">';
print '<a class="reposition" href="' . $href . '">';
print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
print '</a>';
print '</td>';
}

print '</tr>';
// Action delete line
if ($permissiontodelete) {
$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=deleteline&token=' . newToken() . '&lineid=' . ((int) $line->id);
print '<td class="center">';
print '<a class="reposition" href="' . $href . '">';
print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
print '</a>';
print '</td>';
}

print '</tr>';
}
// Show detailed of already consumed with js code to collapse
foreach ($arrayoflines as $line2) {
print '<tr class="expanddetail'.$line->id.' hideobject opacitylow">';
Expand Down Expand Up @@ -1096,6 +1182,16 @@
// Split All
print '<td></td>';

// Action Edit line
if ($object->status == Mo::STATUS_DRAFT) {
$href = $_SERVER["PHP_SELF"] . '?id=' . ((int) $object->id) . '&action=editline&token=' . newToken() . '&lineid=' . ((int) $line->id);
print '<td class="center">';
print '<a class="reposition" href="' . $href . '">';
print img_picto($langs->trans('TooltipEditAndRevertStockMovement'), 'edit');
print '</a>';
print '</td>';
}

// Action delete line
if ($permissiontodelete) {
$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
Expand Down Expand Up @@ -1130,7 +1226,7 @@
print '<input type="hidden" name="product-'.$line->id.'-'.$i.'" value="'.$line->fk_product.'">';

// Qty
print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-'.$line->id.'-'.$i.'" name="qty-'.$line->id.'-'.$i.'" value="'.$preselected.'" '.$disable.'></td>';
print '<td class="right"><input type="text" class="width50 right" id="qtytoconsume-' . $line->id . '-' . $i . '" name="qty-' . $line->id . '-' . $i . '" value="' . $preselected . '" ' . $disable . '></td>';

// Cost
if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
Expand Down Expand Up @@ -1183,6 +1279,11 @@
}
print '</td>';

// Edit Line
if ($object->status == Mo::STATUS_DRAFT) {
print '<td></td>';
}

// Action delete line
if ($permissiontodelete) {
print '<td></td>';
Expand Down

0 comments on commit 3f75077

Please sign in to comment.