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

Merge branch 'NEW_OF_Child' of github.com:atm-lena/dolibarr into NEW_OF_Child

Browse Source
This commit is contained in:
atm-lena 2022-02-15 12:43:42 +01:00
commit 1931ad3bab
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/mrp/mo_card.php
View File

@ -131,12 +131,13 @@ if (empty($reshook)) {
$backtopage = $backtopageforcancel; $backtopage = $backtopageforcancel;
} }
$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
if ($action == 'add' && empty($id)) { if ($action == 'add' && empty($id)) {
$noback = ""; $noback = "";
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
@ -146,7 +147,6 @@ if (empty($reshook)) {
$objectbomchildline = new BOMLine($db); $objectbomchildline = new BOMLine($db);
foreach ($TBomLineId as $id_bom_line) { foreach ($TBomLineId as $id_bom_line) {
$object = new Mo($db); $object = new Mo($db);
$objectbomchildline->fetch($id_bom_line); $objectbomchildline->fetch($id_bom_line);
@ -169,11 +169,12 @@ if (empty($reshook)) {
header("Location: ".$urltogo); header("Location: ".$urltogo);
exit; exit;
} }
include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
// Actions when linking object each other // Actions when linking object each other
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
@ -461,7 +462,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if ($ref == 'PROV') { if ($ref == 'PROV') {
$object->fetch_product(); $object->fetch_product();
$numref = $object->getNextNumRef($object->fk_product); $numref = $object->getNextNumRef($object->fk_product);
} else { } else {
$numref = $object->ref; $numref = $object->ref;
} }
@ -773,7 +773,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang); print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
// Show links to link elements // Show links to link elements
$linktoelem = $form->showLinkToObjectBlock($object,'', array('mo')); $linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem); $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);

1
htdocs/mrp/tpl/originproductline.tpl.php
View File

@ -50,7 +50,6 @@ if($res){
print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">'; print ' <a class="collapse_bom" id="collapse-'.$line->id.'" href="#">';
print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open')); print (empty($conf->global->BOM_SHOW_ALL_BOM_BY_DEFAULT) ? img_picto('', 'folder') : img_picto('', 'folder-open'));
print '</a>'; print '</a>';
} else { } else {
print $this->tpl['label']; print $this->tpl['label'];
} }