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

Debug v16

Browse Source
This commit is contained in:
Laurent Destailleur 2022-06-02 10:34:05 +02:00
parent 43dedcb2b1
commit 9f59eaa752
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/comm/remx.php
View File

@ -284,11 +284,11 @@ if ($socid > 0) {
}
print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
print '<td class="amount">'.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
if (!empty($user->fk_soc)) { // No need to show this for external users
print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
print '<td class="amount">'.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
}
}
@ -314,11 +314,11 @@ if ($socid > 0) {
}
print '<tr><td class="titlefield">'.$langs->trans("SupplierAbsoluteDiscountAllUsers").'</td>';
print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
print '<td class="amount">'.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
if (!empty($user->fk_soc)) { // No need to show this for external users
print '<tr><td>'.$langs->trans("SupplierAbsoluteDiscountMy").'</td>';
print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
print '<td class="amount">'.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
}
}
@ -382,7 +382,7 @@ if ($socid > 0) {
print '<br>';
if ($_GET['action'] == 'remove') {
if ($action == 'remove') {
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.GETPOST('remid'), $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1);
}
@ -445,7 +445,7 @@ if ($socid > 0) {
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').'</td>';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
print '<td class="minwidth100">';
$facturestatic->id = $obj->fk_facture_source;
@ -472,15 +472,15 @@ if ($socid > 0) {
print $obj->description;
print '</td>';
}
print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
print '<td class="right">'.price($obj->amount_ht).'</td>';
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right">'.price($obj->amount_ttc).'</td>';
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="center">';
print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
@ -583,7 +583,7 @@ if ($socid > 0) {
$obj = $db->fetch_object($resql);
print '<tr class="oddeven">';
print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').'</td>';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
print '<td class="minwidth100">';
$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@ -610,15 +610,15 @@ if ($socid > 0) {
print $obj->description;
print '</td>';
}
print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
print '<td class="right">'.price($obj->amount_ht).'</td>';
print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
print '<td class="right amount">'.price($obj->amount_ht).'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
}
print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
print '<td class="right">'.price($obj->amount_ttc).'</td>';
print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
if (!empty($conf->multicurrency->enabled)) {
print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
}
print '<td class="center">';
print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';