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

Merge remote-tracking branch 'upstream/develop' into useismodenabled

Browse Source
This commit is contained in:
Frédéric France 2022-06-10 17:49:44 +02:00
commit 51462a276a
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/compta/paymentbybanktransfer/index.php
View File

@ -159,11 +159,11 @@ if ($resql) {
$thirdpartystatic->idprof5 = $obj->idprof5;
$thirdpartystatic->idprof6 = $obj->idprof6;
print '<tr class="oddeven"><td>';
print '<tr class="oddeven"><td class="nowraponall">';
print $invoicestatic->getNomUrl(1, 'withdraw');
print '</td>';
print '<td>';
print '<td class="tdoverflowmax150">';
print $thirdpartystatic->getNomUrl(1, 'supplier');
print '</td>';
@ -226,14 +226,14 @@ if ($result) {
print '<tr class="oddeven">';
print "<td>";
print '<td class="nowraponall">';
$bprev->id = $obj->rowid;
$bprev->ref = $obj->ref;
$bprev->statut = $obj->statut;
print $bprev->getNomUrl(1);
print "</td>\n";
print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
print '<td class="right nowraponall"><span class="amount">'.price($obj->amount)."</span></td>\n";
print '<td class="right"><span class="amount">'.$bprev->getLibStatut(3)."</span></td>\n";
print "</tr>\n";

11
htdocs/compta/prelevement/card.php
View File

@ -185,18 +185,18 @@ if ($id > 0 || $ref) {
print '</tr>';
*/
if ($object->date_trans <> 0) {
if (!empty($object->date_trans)) {
$muser = new User($db);
$muser->fetch($object->user_trans);
print '<tr><td>'.$langs->trans("TransData").'</td><td>';
print dol_print_date($object->date_trans, 'day');
print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
print ' &nbsp; <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
print $object->methodes_trans[$object->method_trans];
print '</td></tr>';
}
if ($object->date_credit <> 0) {
if (!empty($object->date_credit)) {
print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
print dol_print_date($object->date_credit, 'day');
print '</td></tr>';
@ -290,7 +290,7 @@ if ($id > 0 || $ref) {
print '<br>';
}
if (!empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
if (!empty($object->date_trans) && empty($object->date_credit) && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
$btnLabel = ($object->type == 'bank-transfer') ? $langs->trans("ClassDebited") : $langs->trans("ClassCredited");
print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
print '<input type="hidden" name="token" value="'.newToken().'">';
@ -318,8 +318,7 @@ if ($id > 0 || $ref) {
if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->send);
else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->send);
}
if (!empty($object->date_trans) && $object->date_credit == 0) {
if (!empty($object->date_trans) && empty($object->date_credit)) {
if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->debit);
else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
}

14
htdocs/compta/prelevement/index.php
View File

@ -159,11 +159,11 @@ if ($resql) {
$thirdpartystatic->idprof5 = $obj->idprof5;
$thirdpartystatic->idprof6 = $obj->idprof6;
print '<tr class="oddeven"><td>';
print '<tr class="oddeven"><td class="nowraponall">';
print $invoicestatic->getNomUrl(1, 'withdraw');
print '</td>';
print '<td>';
print '<td class="tdoverflowmax150">';
print $thirdpartystatic->getNomUrl(1, 'customer');
print '</td>';
@ -225,17 +225,17 @@ if ($result) {
while ($i < min($num, $limit)) {
$obj = $db->fetch_object($result);
print '<tr class="oddeven">';
print "<td>";
$bprev->id = $obj->rowid;
$bprev->ref = $obj->ref;
$bprev->statut = $obj->statut;
print '<tr class="oddeven">';
print '<td class="nowraponall">';
print $bprev->getNomUrl(1);
print "</td>\n";
print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
print '<td class="right nowraponall"><span class="amount">'.price($obj->amount)."</span></td>\n";
print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
print "</tr>\n";