diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5efbdeae8e1..6caf54638c9 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7544,7 +7544,6 @@ class Form
public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')
{
global $conf, $user;
-
$objecttmp = null;
// Example of value for $objectdec:
@@ -7771,7 +7770,7 @@ class Form
}
$sql .= $this->db->order($sortfield ? $sortfield : $fieldstoshow, "ASC");
//$sql.=$this->db->plimit($limit, 0);
- //print $sql;
+// print $sql;
// Build output string
$resql = $this->db->query($sql);
@@ -8509,7 +8508,6 @@ class Form
{
global $conf, $langs, $hookmanager;
global $bc, $action;
-
$object->fetchObjectLinked();
// Bypass the default method
@@ -8624,6 +8622,7 @@ class Form
// Output template part (modules that overwrite templates must declare this into descriptor)
$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));
+
foreach ($dirtpls as $reldir) {
if ($nboftypesoutput == ($nbofdifferenttypes - 1)) { // No more type to show after
global $noMoreLinkedObjectBlockAfter;
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 9374fc2e4d0..7189228abe0 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -39,44 +39,76 @@ $langs->load("bom");
$total = 0;
$ilink = 0;
-$mo_static = new Mo($db);
-$res = $mo_static->fetch($object->id);
-$TMoChilds = $mo_static->getMoChilds();
+if($object->element == 'mo') {
-foreach ($TMoChilds as $key => $objectlink) {
- $ilink++;
+ $mo_static = new Mo($db);
+ $res = $mo_static->fetch($object->id);
+ $TMoChilds = $mo_static->getMoChilds();
- $trclass = 'oddeven';
- echo '';
- echo ''.$langs->trans("ManufacturingOrder");
- if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
- print ' $objectlink) {
+ $ilink++;
+
+ $trclass = 'oddeven';
+
+ echo '';
+ echo '| ' . $langs->trans("ManufacturingOrder");
+ if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+ print ' ';
+ echo ' | ' . $objectlink->getNomUrl(1) . ' | ';
+
+ echo '';
+ // $result = $product_static->fetch($objectlink->fk_product);
+ print ' | ';
+ echo '' . dol_print_date($objectlink->date_creation, 'day') . ' | ';
+ echo '- | ';
+ echo '' . $objectlink->getLibStatut(3) . ' | ';
+ echo '';
+
+ // we want to make the link via element_element for delete action
+ $sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
+ $sql .= " WHERE fk_source = " . (int)$object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'";
+
+ $resql = $db->query($sql);
+ $k = 0;
+ if ($resql) {
+ $obj = $db->fetch_object($resql);
+ if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
+ }
+ echo '' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '';
+ echo ' | ';
+ echo " \n";
}
- echo ' | ';
- echo ''.$objectlink->getNomUrl(1).' | ';
+} else {
+ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
- echo '';
- // $result = $product_static->fetch($objectlink->fk_product);
- print ' | ';
- echo ''.dol_print_date($objectlink->date_creation, 'day').' | ';
- echo '- | ';
- echo ''.$objectlink->getLibStatut(3).' | ';
- echo '';
+ $total = 0;
+ $ilink = 0;
+ foreach ($linkedObjectBlock as $key => $objectlink) {
+ $ilink++;
- // we want to make the link via element_element for delete action
- $sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
- $sql .= " WHERE fk_source = ". (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) ."'";
+ $trclass = 'oddeven';
+ if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+ $trclass .= ' liste_sub_total';
+ }
+ print ' |
';
+ print '| '.$langs->trans("ManufacturingOrder");
+ if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+ $url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$objectlink->id;
+ print ' ';
+ }
+ print ' | ';
- $resql = $db->query($sql);
- $k = 0;
- if ($resql) {
- $obj = $db->fetch_object($resql);
- if ($obj->rowid && $obj->rowid > 0 ) $k = $obj->rowid;
+ print ''.$objectlink->getNomUrl(1).' | ';
+ print ''.$objectlink->ref_client.' | ';
+ print ''.dol_print_date($objectlink->date_start_planned, 'day').' | ';
+ print '- | ';
+ print ''.$objectlink->getLibStatut(3).' | ';
+ print ''.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').' | ';
+ print "
\n";
}
- echo '' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '';
- echo '';
- echo "\n";
}
echo "\n";