Merge branch '23.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
c3e043d656
4 changed files with 9 additions and 6 deletions
|
|
@ -5589,9 +5589,9 @@ if ($action == 'create') {
|
|||
}
|
||||
print '</td></tr></table>';
|
||||
print '</td><td>';
|
||||
$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 '<input type="hidden" name="token" value="'.newToken().'">';
|
||||
print '<input type="hidden" name="id" value="'.$object->id.'">';
|
||||
print '<input type="hidden" name="page_y" value="">';
|
||||
$liststatus = array('0' => $langs->trans("None"), '1' => $langs->trans("DisputeOpen"), '9' => $langs->trans("DisputeClosed"));
|
||||
print $form->selectarray('dispute_status', $liststatus, $object->dispute_status);
|
||||
print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Save").'">';
|
||||
print '</form>';
|
||||
|
|
|
|||
|
|
@ -1958,7 +1958,7 @@ if (!empty($arrayfields['f.import_key']['checked'])) {
|
|||
// Dispute status
|
||||
if (!empty($arrayfields['f.dispute_status']['checked'])) {
|
||||
print '<td class="liste_titre center parentonrightofpage">';
|
||||
$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 '</td>';
|
||||
|
|
@ -3087,7 +3087,7 @@ if ($num > 0) {
|
|||
if (!empty($arrayfields['f.dispute_status']['checked'])) {
|
||||
print '<td class="nowrap center">';
|
||||
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 "</td>";
|
||||
|
|
|
|||
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue