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

NEW - Add edit line on MO #26122

Merged
merged 8 commits into from
Oct 26, 2023
Merged

NEW - Add edit line on MO #26122

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d72d11
Added the possibility of editing lines
atm-lucasmantegari Oct 4, 2023
7e3d91a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into N…
atm-lucasmantegari Oct 6, 2023
3976f98
Review code
atm-lucasmantegari Oct 6, 2023
68add09
add exit
atm-lucasmantegari Oct 16, 2023
e29e641
Add same action
atm-lucasmantegari Oct 17, 2023
41cf64f
check Travis
atm-lucasmantegari Oct 23, 2023
7f01518
Travis
atm-lucasmantegari Oct 23, 2023
79636b9
Update mo_production.php
eldy Oct 26, 2023
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
291 changes: 196 additions & 95 deletions htdocs/mrp/mo_production.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,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);
atm-lucasmantegari marked this conversation as resolved.
Show resolved Hide resolved
exit;
}
}
}


Expand Down Expand Up @@ -685,7 +696,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 @@ -808,6 +819,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 @@ -890,116 +906,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">';
atm-lucasmantegari marked this conversation as resolved.
Show resolved Hide resolved
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 @@ -1053,6 +1139,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 @@ -1087,7 +1183,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 @@ -1140,6 +1236,11 @@
}
print '</td>';

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

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