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

18
htdocs/multicurrency/multicurrency_rate.php
View File

@ -217,7 +217,7 @@ if (empty($reshook)) {
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
$sall = "";
$search_date_sync = "";
$search_date_sync_end="";
$search_date_sync_end="";
$search_rate = "";
$search_code = "";
$search_array_options = array();
@ -298,10 +298,10 @@ $sql .= $hookmanager->resPrint;
$sql .= ' FROM '.MAIN_DB_PREFIX.'multicurrency_rate as cr ';
$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 ($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)."')";
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)."')";
} 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));
}
if ($search_rate) $sql .= natural_search('cr.rate', $search_rate);
if ($search_code) $sql .= natural_search('m.code', $search_code);
@ -355,9 +355,9 @@ if ($resql) {
}
if ($search_date_sync) $param = "&search_date_sync=".$search_date_sync;
if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
if ($search_date_sync_end) $param="&search_date_sync_end=".$search_date_sync_end;
if ($search_rate) $param = "&search_rate=".urlencode($search_rate);
if ($search_code != '') $param.="&search_code=".urlencode($search_code);
if ($search_code != '') $param.="&search_code=".urlencode($search_code);
// Add $param from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@ -427,13 +427,13 @@ if ($resql) {
if (!empty($arrayfields['cr.date_sync']['checked'])) {
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_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>';
}
// code
if (!empty($arrayfields['m.code']['checked'])) {
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>';
}
// rate
@ -481,6 +481,7 @@ if ($resql) {
print '<tr class="oddeven">';
// USER REQUEST UPDATE FOR THIS LINE
if ($action == "updateRate" && $obj->rowid == $id_rate_selected) {
// var_dump($obj);
@ -545,6 +546,7 @@ if ($resql) {
}
print '</td>';
if (!$i) $totalarray['nbfield']++;
}
print "</tr>\n";