diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d22e532d837..9007e0413b1 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3308,24 +3308,9 @@ else } // Reopen a standard paid invoice - if ($fac->type == 1 && $fac->statut == 2) // A paid invoice (partially or completely) + if (($fac->type == 0 || $fac->type == 1) && ($fac->statut == 2 || $fac->statut == 3)) // A paid invoice (partially or completely) { - if (! $facidnext) - { - print ''.$langs->trans('ReOpen').''; - } - else - { - print ''.$langs->trans('ReOpen').''; - } - } - - // Reopen a classified invoice - if (($fac->statut == 2 || $fac->statut == 3) && // Closed invoice - $fac->getIdReplacingInvoice() == 0 && // Not replaced by another invoice - $fac->close_code != 'replaced') // Not replaced by another invoice - { - if (! $facidnext) + if (! $facidnext && $fac->close_code != 'replaced') // Not replaced by another invoice { print ''.$langs->trans('ReOpen').''; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 187836a0d8f..3c3da65807f 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1189,17 +1189,16 @@ else print '