diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e8511ab6e5c..a47b1692ca9 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -93,27 +93,24 @@ foreach ($object->fields as $key => $val) {
}
}
-// Definition of fields for list
+// Definition of array of fields for columns
$arrayfields = array();
foreach ($object->fields as $key => $val) {
// If $val['visible']==0, then we never show the field
if (!empty($val['visible'])) {
- $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+ $visible = (int) dol_eval($val['visible'], 1);
+ $arrayfields['t.'.$key] = array(
+ 'label'=>$val['label'],
+ 'checked'=>(($visible < 0) ? 0 : 1),
+ 'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+ 'position'=>$val['position'],
+ 'help'=>$val['help']
+ );
}
}
// Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
- if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
- $arrayfields["ef.".$key] = array(
- 'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
- 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
- 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
- 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
- );
- }
- }
-}
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
$object->fields = dol_sort_array($object->fields, 'position');
$arrayfields = dol_sort_array($arrayfields, 'position');
@@ -155,7 +152,7 @@ if (empty($reshook)) {
foreach ($object->fields as $key => $val) {
$search[$key] = '';
}
- $toselect = '';
+ $toselect = array();
$search_array_options = array();
}
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -279,11 +276,8 @@ $form = new Form($db);
$now = dol_now();
$help_url = 'EN:Module_BOM';
-
$title = $langs->trans('ListOfBOMs');
-llxHeader('', $title, $help_url);
-
// Build and execute select
// --------------------------------------------------------------------
@@ -345,7 +339,9 @@ foreach($object->fields as $key => $val)
}
// Add fields from extrafields
if (! empty($extrafields->attributes[$object->table_element]['label'])) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+ foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+ $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+ }
}
// Add where from hooks
$parameters=array();
@@ -395,7 +391,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
// Output page
// --------------------------------------------------------------------
-// llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url);
$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -508,9 +504,9 @@ foreach ($object->fields as $key => $val) {
if (!empty($arrayfields['t.'.$key]['checked'])) {
print '';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
- print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth150', 1);
- } elseif (strpos($val['type'], 'integer:') === 0) {
- print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+ print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+ } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+ print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
print ''.$langs->trans('Ref').': '.$this->ref;
- $url = dol_buildpath('/bom/bom_card.php', 1).'?id='.$this->id;
+ $url = DOL_URL_ROOT.'/bom/bom_card.php?id='.$this->id;
if ($option != 'nolink') {
// Add param to save lastsearch_values or not
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 6258b390432..41561a5a45b 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -226,7 +226,7 @@ if (empty($reshook)) {
$search[$key.'_dtend'] = '';
}
}
- $toselect = '';
+ $toselect = array();
$search_array_options = array();
}
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -517,7 +517,7 @@ foreach ($object->fields as $key => $val) {
print ' ';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
- } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
+ } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
print ''; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '
';
print '
'."\n";
// Fields title search
@@ -453,22 +455,22 @@ foreach ($object->fields as $key => $val) {
if ($key == 'statut') {
continue;
}
- $cssforfield = (empty($val['css']) ? '' : $val['css']);
+ $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
if ($key == 'status') {
$cssforfield .= ($cssforfield ? ' ' : '').'center';
} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
$cssforfield .= ($cssforfield ? ' ' : '').'center';
} elseif (in_array($val['type'], array('timestamp'))) {
$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+ } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
$cssforfield .= ($cssforfield ? ' ' : '').'right';
}
if (!empty($arrayfields['t.'.$key]['checked'])) {
print '';
if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
- } elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
- print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+ } elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+ print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
print ' ';
+
+ foreach ($warehouse->fields as $key => $val) {
+ if ($key == 'statut') {
+ continue;
+ }
+ $cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+ if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ } elseif ($key == 'status') {
+ $cssforfield .= ($cssforfield ? ' ' : '').'center';
}
- $warehouse->id = $obj->rowid;
- $warehouse->ref = $obj->ref;
- $warehouse->label = $obj->ref;
- $warehouse->lieu = $obj->lieu;
- $warehouse->fk_parent = $obj->fk_parent;
- $warehouse->statut = $obj->statut;
-
- foreach ($object->fields as $key => $val) {
- $warehouse->{$key} = $obj->{$key};
+ if (in_array($val['type'], array('timestamp'))) {
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ } elseif ($key == 'ref') {
+ $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
}
- // Show here line of result
- print ' ';
+ if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status' && empty($val['arrayofkeyval'])) {
+ $cssforfield .= ($cssforfield ? ' ' : '').'right';
+ }
+ if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
+ $cssforfield = 'tdoverflowmax100';
+ }
- foreach ($warehouse->fields as $key => $val) {
+ if (!empty($arrayfields['t.'.$key]['checked'])) {
+ print '';
if ($key == 'statut') {
- continue;
+ print $warehouse->getLibStatut(5);
}
- $cssforfield = (empty($val['css']) ? '' : $val['css']);
- if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
- } elseif ($key == 'status') {
- $cssforfield .= ($cssforfield ? ' ' : '').'center';
+ if ($key == 'phone') {
+ print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
+ } elseif ($key == 'fax') {
+ print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
+ } else {
+ print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
}
-
- if (in_array($val['type'], array('timestamp'))) {
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
- } elseif ($key == 'ref') {
- $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+ print '';
+ if (!$i) {
+ $totalarray['nbfield']++;
}
-
- if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
- $cssforfield .= ($cssforfield ? ' ' : '').'right';
- }
-
- if (!empty($arrayfields['t.'.$key]['checked'])) {
- print '';
- if ($key == 'statut') {
- print $warehouse->getLibStatut(5);
- }
- if ($key == 'phone') {
- print dol_print_phone($obj->phone, '', 0, $obj->rowid, 'AC_TEL');
- } elseif ($key == 'fax') {
- print dol_print_phone($obj->fax, '', 0, $obj->rowid, 'AC_FAX');
- } else {
- print $warehouse->showOutputField($val, $key, $warehouse->$key, '');
- }
- print '';
+ if (!empty($val['isameasure'])) {
if (!$i) {
- $totalarray['nbfield']++;
+ $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
}
- if (!empty($val['isameasure'])) {
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
- }
- if (!isset($totalarray['val'])) {
- $totalarray['val'] = array();
- }
- if (!isset($totalarray['val']['t.'.$key])) {
- $totalarray['val']['t.'.$key] = 0;
- }
- $totalarray['val']['t.'.$key] += $warehouse->$key;
+ if (!isset($totalarray['val'])) {
+ $totalarray['val'] = array();
}
- }
- }
-
- // Stock qty
- if (!empty($arrayfields["stockqty"]['checked'])) {
- print ''.price2num($obj->stockqty, 5).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'stockqty';
- }
- }
-
- // PMP value
- if (!empty($arrayfields["estimatedvalue"]['checked'])) {
- print '';
- if (price2num($obj->estimatedvalue, 'MT')) {
- print ''.price(price2num($obj->estimatedvalue, 'MT'), 1).' ';
- } else {
- print '';
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'estimatedvalue';
- }
- }
-
- // Selling value
- if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
- print '';
- if (empty($conf->global->PRODUIT_MULTIPRICES)) {
- if ($obj->sellvalue) {
- print ''.price(price2num($obj->sellvalue, 'MT'), 1).' ';
+ if (!isset($totalarray['val']['t.'.$key])) {
+ $totalarray['val']['t.'.$key] = 0;
}
- } else {
- $htmltext = $langs->trans("OptionMULTIPRICESIsOn");
- print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
- }
- print ' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
- if (!$i) {
- $totalarray['pos'][$totalarray['nbfield']] = 'estimatedstockvaluesell';
+ $totalarray['val']['t.'.$key] += $warehouse->$key;
}
}
+ }
- // Extra fields
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
- // Fields from hook
- $parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
- $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
- print $hookmanager->resPrint;
-
- // Status
- if (!empty($arrayfields['t.statut']['checked'])) {
- print ''.$warehouse->LibStatut($obj->statut, 5).' ';
- if (!$i) {
- $totalarray['nbfield']++;
- }
+ // Stock qty
+ if (!empty($arrayfields["stockqty"]['checked'])) {
+ print ''.price2num($obj->stockqty, 5).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
}
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'stockqty';
+ }
+ }
- // Action column
- print '';
- if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
- $selected = 0;
- if (in_array($obj->rowid, $arrayofselected)) {
- $selected = 1;
- }
- print ' ';
+ if (price2num($obj->estimatedvalue, 'MT')) {
+ print ''.price(price2num($obj->estimatedvalue, 'MT'), 1).' ';
+ } else {
+ print '';
}
print ' ';
if (!$i) {
$totalarray['nbfield']++;
}
-
- print ' '."\n";
-
-
- $i++;
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'estimatedvalue';
+ }
}
- if ($totalnboflines - $offset <= $limit) {
- // Show total line
- include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+ // Selling value
+ if (!empty($arrayfields["estimatedstockvaluesell"]['checked'])) {
+ print '';
+ if (empty($conf->global->PRODUIT_MULTIPRICES)) {
+ if ($obj->sellvalue) {
+ print ''.price(price2num($obj->sellvalue, 'MT'), 1).' ';
+ }
+ } else {
+ $htmltext = $langs->trans("OptionMULTIPRICESIsOn");
+ print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ if (!$i) {
+ $totalarray['pos'][$totalarray['nbfield']] = 'estimatedstockvaluesell';
+ }
}
+
+ // Extra fields
+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+ // Fields from hook
+ $parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+ $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+ print $hookmanager->resPrint;
+
+ // Status
+ if (!empty($arrayfields['t.statut']['checked'])) {
+ print ''.$warehouse->LibStatut($obj->statut, 5).' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+ }
+
+ // Action column
+ print '';
+ if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+ $selected = 0;
+ if (in_array($obj->rowid, $arrayofselected)) {
+ $selected = 1;
+ }
+ print ' ';
+ if (!$i) {
+ $totalarray['nbfield']++;
+ }
+
+ print ''."\n";
+
+
+ $i++;
+}
+
+if ($totalnboflines - $offset <= $limit) {
+ // Show total line
+ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+}
+
+// If no record found
+if ($num == 0) {
+ $colspan = 1;
+ foreach ($arrayfields as $key => $val) {
+ if (!empty($val['checked'])) {
+ $colspan++;
+ }
+ }
+ print ''.$langs->trans("NoRecordFound").'