diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index c0e96aa4b15..6c8a1ec6b21 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -284,11 +284,11 @@ if ($socid > 0) {
}
print '
| '.$langs->trans("CustomerAbsoluteDiscountAllUsers").' | ';
- print ''.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' |
';
+ print ''.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").' | ';
if (!empty($user->fk_soc)) { // No need to show this for external users
print '| '.$langs->trans("CustomerAbsoluteDiscountMy").' | ';
- print ''.$remise_user.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' |
';
+ print ''.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").' | ';
}
}
@@ -314,11 +314,11 @@ if ($socid > 0) {
}
print '| '.$langs->trans("SupplierAbsoluteDiscountAllUsers").' | ';
- print ''.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' |
';
+ print ''.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").' | ';
if (!empty($user->fk_soc)) { // No need to show this for external users
print '| '.$langs->trans("SupplierAbsoluteDiscountMy").' | ';
- print ''.$remise_user.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' |
';
+ print ''.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").' | ';
}
}
@@ -382,7 +382,7 @@ if ($socid > 0) {
print '
';
- 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 '';
- print '| '.dol_print_date($db->jdate($obj->dc), 'dayhour').' | ';
+ print ''.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').' | ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
print '';
$facturestatic->id = $obj->fk_facture_source;
@@ -472,15 +472,15 @@ if ($socid > 0) {
print $obj->description;
print ' | ';
}
- print ''.$langs->trans("NotConsumed").' | ';
- print ''.price($obj->amount_ht).' | ';
+ print ''.$langs->trans("NotConsumed").' | ';
+ print ''.price($obj->amount_ht).' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($obj->multicurrency_amount_ht).' | ';
+ print ''.price($obj->multicurrency_amount_ht).' | ';
}
print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).' | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ttc).' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($obj->multicurrency_amount_ttc).' | ';
+ print ''.price($obj->multicurrency_amount_ttc).' | ';
}
print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'';
@@ -583,7 +583,7 @@ if ($socid > 0) {
$obj = $db->fetch_object($resql);
print ' |
';
- print '| '.dol_print_date($db->jdate($obj->dc), 'dayhour').' | ';
+ print ''.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').' | ';
if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
print '';
$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -610,15 +610,15 @@ if ($socid > 0) {
print $obj->description;
print ' | ';
}
- print ''.$langs->trans("NotConsumed").' | ';
- print ''.price($obj->amount_ht).' | ';
+ print ''.$langs->trans("NotConsumed").' | ';
+ print ''.price($obj->amount_ht).' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($obj->multicurrency_amount_ht).' | ';
+ print ''.price($obj->multicurrency_amount_ht).' | ';
}
print ''.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).' | ';
- print ''.price($obj->amount_ttc).' | ';
+ print ''.price($obj->amount_ttc).' | ';
if (!empty($conf->multicurrency->enabled)) {
- print ''.price($obj->multicurrency_amount_ttc).' | ';
+ print ''.price($obj->multicurrency_amount_ttc).' | ';
}
print '';
print ''.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'';
|