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

merge conflict

Browse Source
This commit is contained in:
x 2021-04-19 12:00:20 +02:00
commit b41d90aa51
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/multicurrency/multicurrency_rate.php
View File

@ -298,7 +298,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));
@ -481,6 +481,7 @@ if ($resql) {
print '<tr class="oddeven">'; print '<tr class="oddeven">';
// USER REQUEST UPDATE FOR THIS LINE // USER REQUEST UPDATE FOR THIS LINE
if ($action == "updateRate" && $obj->rowid == $id_rate_selected) { if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
// var_dump($obj); // var_dump($obj);
@ -545,6 +546,7 @@ if ($resql) {
} }
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }
print "</tr>\n"; print "</tr>\n";