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

merge conflict

Browse Source
This commit is contained in:
jpb 2021-04-19 12:25:38 +02:00
commit a30c15c81d
1 changed files with 50 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/multicurrency/multicurrency_rate.php
View File

@ -487,6 +487,8 @@ if ($resql) {
// var_dump($obj); // var_dump($obj);
$form = new Form($db); $form = new Form($db);
print '<td>' . $form->selectDate($obj->date_sync, 'dateinput', 0, 0, 1).'</td>'; print '<td>' . $form->selectDate($obj->date_sync, 'dateinput', 0, 0, 1).'</td>';
print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>'; print '<td>' . $form->selectMultiCurrency($obj->code, 'multicurrency_code', 1, " code != '".$conf->currency."'", true) . '</td>';
print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>'; print ' <td><input type="number" min ="0" step="any" class="minwidth200" name="rateinput" value="' . dol_escape_htmltag($obj->rate) . '"></td>';
@ -496,11 +498,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";
@ -508,8 +508,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";
@ -518,8 +517,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";
@ -533,8 +531,7 @@ if ($resql) {
// Action // Action
print '<td class="nowrap " >'; print '<td class="nowrap " >';
if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined 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; $selected = 0;
if (in_array($obj->rowid, $arrayofselected)) $selected = 1; if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
$par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1'; $par = '&amp;id_rate='.$obj->rowid.'&amp;page='.$page.'&amp;sortorder='.$sortorder.'&amp;sortfield='.$sortfield.'&amp;search_code='.$search_code.'&amp;search_rate='.$search_rate.'&amp;search_date_sync='.dol_print_date($search_date_sync, "%Y-%m-%d") .'&amp;search_date_sync_end='.dol_print_date($search_date_sync_end, "%Y-%m-%d") .'&amp;edit_mode=1';
@ -544,7 +541,6 @@ if ($resql) {
} }
print '</td>'; print '</td>';
if (!$i) $totalarray['nbfield']++; if (!$i) $totalarray['nbfield']++;
} }
print "</tr>\n"; print "</tr>\n";