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

2
htdocs/multicurrency/multicurrency_rate.php
View File

@ -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";