diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 1977790eea8..72431cebb1a 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -5589,9 +5589,9 @@ if ($action == 'create') { } print ''; print ''; + $liststatus = array('0' => "None", '1' => "DisputeOpen", '8' => "DisputeLost", '9' => "DisputeWon"); if ($action != 'editdispute_status') { if ($object->dispute_status) { - $liststatus = array('0' => "None", '1' => "DisputeOpen", '9' => "DisputeClosed"); print $langs->trans($liststatus[$object->dispute_status]); } } else { @@ -5600,7 +5600,6 @@ if ($action == 'create') { print ''; print ''; print ''; - $liststatus = array('0' => $langs->trans("None"), '1' => $langs->trans("DisputeOpen"), '9' => $langs->trans("DisputeClosed")); print $form->selectarray('dispute_status', $liststatus, $object->dispute_status); print ''; print ''; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 03b49318797..1c8daba4be2 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -1958,7 +1958,7 @@ if (!empty($arrayfields['f.import_key']['checked'])) { // Dispute status if (!empty($arrayfields['f.dispute_status']['checked'])) { print ''; - $liststatus = array('0' => "None", '1' => "DisputeOpen", '9' => "DisputeClosed"); + $liststatus = array('0' => "None", '1' => "DisputeOpen", '8' => "DisputeLost", '9' => "DisputeWon"); // @phan-suppress-next-line PhanPluginSuspiciousParamOrder print $form->selectarray('search_dispute_status', $liststatus, $search_dispute_status, 1, 0, 0, '', 1, 0, 0, '', 'search_status width100 onrightofpage', 1); print ''; @@ -3087,7 +3087,7 @@ if ($num > 0) { if (!empty($arrayfields['f.dispute_status']['checked'])) { print ''; if ($facturestatic->dispute_status) { - $liststatus = array('0' => "None", '1' => "DisputeOpen", '9' => "DisputeClosed"); + $liststatus = array('0' => "None", '1' => "DisputeOpen", '8' => "DisputeWon", '9' => "DisputeLost"); print $langs->trans($liststatus[$facturestatic->dispute_status]); } print ""; diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index eccb7cdd46e..cc6249d3d0d 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -1115,8 +1115,10 @@ abstract class CommonInvoice extends CommonObject */ if (isset($moreparams['dispute_status']) && $moreparams['dispute_status']) { $labelStatus .= ' - '; - if ($moreparams['dispute_status'] == 9) { - $labelStatus .= $langs->trans("DisputeClosed"); + if ($moreparams['dispute_status'] == 8) { + $labelStatus .= $langs->trans("DisputeLost"); + } elseif ($moreparams['dispute_status'] == 9) { + $labelStatus .= $langs->trans("DisputeWon"); } else { $labelStatus .= $langs->trans("DisputeOpen"); $statusType = 'status8'; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 6c8707008f0..eda12fb4244 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -706,6 +706,8 @@ TypeAmountOfEachNewDiscountSplit=Input amount for each part SplitDiscountTitle=Split discount into several parts DisputeStatus=Dispute status DisputeOpen=Dispute open +DisputeLost=Dispute lost +DisputeWon=Dispute won DisputeClosed=Dispute closed Dispute=Dispute Sales=Sales