Fixing style errors.
This commit is contained in:
parent
6aa9c35f0f
commit
d5af15a102
@ -202,8 +202,7 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
|
|||||||
$parameters = array();
|
$parameters = array();
|
||||||
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
|
$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
|
||||||
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
||||||
if (empty($reshook))
|
if (empty($reshook)) {
|
||||||
{
|
|
||||||
// Selection of new fields
|
// Selection of new fields
|
||||||
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
|
include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
|
||||||
|
|
||||||
@ -292,7 +291,7 @@ $sql .= $hookmanager->resPrint;
|
|||||||
$sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
|
||||||
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
|
$sql .= " INNER JOIN ".MAIN_DB_PREFIX."multicurrency AS m ON cr.fk_multicurrency = m.rowid";
|
||||||
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
|
||||||
if ($search_date_sync && $search_date_sync_end ){
|
if ($search_date_sync && $search_date_sync_end ) {
|
||||||
$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
|
$sql .= " AND (cr.date_sync BETWEEN '".$db->idate($search_date_sync)."' AND '".$db->idate($search_date_sync_end)."')";
|
||||||
} elseif ($search_date_sync && !$search_date_sync_end) {
|
} elseif ($search_date_sync && !$search_date_sync_end) {
|
||||||
$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
|
$sql .= natural_search('cr.date_sync', $db->idate($search_date_sync));
|
||||||
@ -418,24 +417,24 @@ if ($resql) {
|
|||||||
print '<tr class="liste_titre_filter">';
|
print '<tr class="liste_titre_filter">';
|
||||||
|
|
||||||
// date
|
// date
|
||||||
if (!empty($arrayfields['cr.date_sync']['checked'])) {
|
if (!empty($arrayfields['cr.date_sync']['checked'])) {
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre" align="left">';
|
||||||
print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
|
print $form->selectDate(dol_print_date($search_date_sync, "%Y-%m-%d"), 'search_date_sync', 0, 0, 1);
|
||||||
print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
|
print $form->selectDate(dol_print_date($search_date_sync_end, "%Y-%m-%d"), 'search_date_sync_end', 0, 0, 1);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// code
|
// code
|
||||||
if (!empty($arrayfields['m.code']['checked'])) {
|
if (!empty($arrayfields['m.code']['checked'])) {
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre" align="left">';
|
||||||
print $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
|
print $form->selectMultiCurrency($multicurrency_code, 'search_code', 1, " code != '".$conf->currency."'", true);
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
// rate
|
// rate
|
||||||
if (!empty($arrayfields['cr.rate']['checked'])) {
|
if (!empty($arrayfields['cr.rate']['checked'])) {
|
||||||
print '<td class="liste_titre" align="left">';
|
print '<td class="liste_titre" align="left">';
|
||||||
print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
|
print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fields from hook
|
// Fields from hook
|
||||||
$parameters = array('arrayfields'=>$arrayfields);
|
$parameters = array('arrayfields'=>$arrayfields);
|
||||||
@ -470,7 +469,7 @@ if ($resql) {
|
|||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
$totalarray = array();
|
$totalarray = array();
|
||||||
while ($i < min($num, $limit)) {
|
while ($i < min($num, $limit)) {
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
@ -488,11 +487,9 @@ if ($resql) {
|
|||||||
print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
|
print '<button type="submit" class="button" name="action" value="update">'.$langs->trans("Modify").'</button>';
|
||||||
print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
|
print '<button type="submit" class="button" name="action" value="cancel">'.$langs->trans("Cancel").'</button>';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
// date_sync
|
// date_sync
|
||||||
if (!empty($arrayfields['cr.date_sync']['checked']))
|
if (!empty($arrayfields['cr.date_sync']['checked'])) {
|
||||||
{
|
|
||||||
print '<td class="tdoverflowmax200">';
|
print '<td class="tdoverflowmax200">';
|
||||||
print $obj->date_sync;
|
print $obj->date_sync;
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
@ -500,8 +497,7 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// code
|
// code
|
||||||
if (! empty($arrayfields['m.code']['checked']))
|
if (! empty($arrayfields['m.code']['checked'])) {
|
||||||
{
|
|
||||||
print '<td class="tdoverflowmax200">';
|
print '<td class="tdoverflowmax200">';
|
||||||
print $obj->code." ".$obj->name;
|
print $obj->code." ".$obj->name;
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
@ -510,8 +506,7 @@ if ($resql) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// rate
|
// rate
|
||||||
if (! empty($arrayfields['cr.rate']['checked']))
|
if (! empty($arrayfields['cr.rate']['checked'])) {
|
||||||
{
|
|
||||||
print '<td class="tdoverflowmax200">';
|
print '<td class="tdoverflowmax200">';
|
||||||
print $obj->rate;
|
print $obj->rate;
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
@ -550,9 +545,9 @@ if ($resql) {
|
|||||||
print "</div>";
|
print "</div>";
|
||||||
|
|
||||||
print '</form>';
|
print '</form>';
|
||||||
} else {
|
} else {
|
||||||
dol_print_error($db);
|
dol_print_error($db);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
llxFooter();
|
llxFooter();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user