diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 6a89406b69f..6ced019c076 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -3076,7 +3076,7 @@ else if ($id > 0 || ! empty($ref))
}
}
} else {
- // Remise dispo de type remise fixe (not credit note)
+ // Discount available of type fixed amount (not credit note)
print '
';
$form->form_remise_dispo($_SERVER["PHP_SELF"] . '?facid=' . $object->id, GETPOST('discountid'), 'remise_id', $soc->id, $absolute_discount, $filterabsolutediscount, $resteapayer, ' (' . $addabsolutediscount . ')');
}
@@ -3289,7 +3289,7 @@ else if ($id > 0 || ! empty($ref))
print '';
// Situations
- if (! empty($conf->global->INVOICE_US_SITUATION))
+ if (! empty($conf->global->INVOICE_USE_SITUATION))
{
if ($object->type == 5 && ($object->situation_counter > 1))
{
@@ -3704,28 +3704,28 @@ else if ($id > 0 || ! empty($ref))
}
// Paye partiellement 'escompte'
- if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'discount_vat') {
+ if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'discount_vat') {
print '
| ';
print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1);
print ' | ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' | |
';
$resteapayeraffiche = 0;
}
// Paye partiellement ou Abandon 'badcustomer'
- if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'badcustomer') {
+ if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') {
print '| ';
print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1);
print ' | ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' | |
';
// $resteapayeraffiche=0;
}
// Paye partiellement ou Abandon 'product_returned'
- if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'product_returned') {
+ if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
print '| ';
print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1);
print ' | ' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' | |
';
$resteapayeraffiche = 0;
}
// Paye partiellement ou Abandon 'abandon'
- if (($object->statut == 2 || $object->statut == 3) && $object->close_code == 'abandon') {
+ if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') {
print '';
$text = $langs->trans("HelpAbandonOther");
if ($object->close_note)
@@ -3817,7 +3817,7 @@ else if ($id > 0 || ! empty($ref))
print '';
// Show global modifiers
- if (! empty($conf->global->INVOICE_US_SITUATION))
+ if (! empty($conf->global->INVOICE_USE_SITUATION))
{
if ($object->situation_cycle_ref && $object->statut == 0) {
print '';
|