Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

NEW Can view/list/edit the dispute status of an invoice

Browse Source
This commit is contained in:
ldestailleur
2025-09-03 18:27:40 +02:00
parent 648fd1e809
commit 61a10cf58d
6 changed files with 105 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
htdocs/compta/facture/card.php
View File

@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2002-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2020 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2025 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2015 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
@@ -43,6 +43,14 @@
// Libraries
require '../../main.inc.php';
/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/
require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
@@ -73,15 +81,6 @@ if (isModEnabled('accounting')) {
require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
}
/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/
// Load translation files required by the page
$langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
if (isModEnabled('incoterm')) {
@@ -652,6 +651,8 @@ if (empty($reshook)) {
}
} elseif ($action == 'set_incoterms' && isModEnabled('incoterm') && $usercancreate) { // Set incoterm
$result = $object->setIncoterms(GETPOSTINT('incoterm_id'), GETPOST('location_incoterms'));
} elseif ($action == 'set_dispute_status' && $usercancreate) { // Set dispute status
$result = $object->setStatut(GETPOSTINT('dispute_status'), null, 'facture', 'FACTURE_MODIFY', 'dispute_status');
} elseif ($action == 'settags' && isModEnabled('category')) { // Set tags
$result = $object->setCategories(GETPOST('categories', 'array'));
} elseif ($action == 'setbankaccount' && $usercancreate) { // bank account
@@ -4527,6 +4528,13 @@ if ($action == 'create') {
print '</td></tr>';
}
// Dispute open
/* Not necessary on creation
print '<tr><td class="nowrap fieldrequired">'.$langs->trans('DisputeOpen').'</td><td colspan="2">';
//print yn($object->dispute_status);
print '</td></tr>';
*/
// Category
if (isModEnabled('category')) {
// Categories
@@ -4877,7 +4885,7 @@ if ($action == 'create') {
// we check object has a draft number
$objectref = substr($object->ref, 1, 4);
if ($objectref == 'PROV') {
$savdate = $object->date;
//$savdate = $object->date;
if (getDolGlobalString('FAC_FORCE_DATE_VALIDATION')) {
$object->date = dol_now();
$object->date_lim_reglement = $object->calculate_date_lim_reglement();
@@ -5421,8 +5429,6 @@ if ($action == 'create') {
} else {
$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, (string) $object->cond_reglement_id, 'none');
}
} else {
print '&nbsp;';
}
print '</td></tr>';
@@ -5445,8 +5451,6 @@ if ($action == 'create') {
print img_warning($langs->trans('Late'));
}
}
} else {
print '&nbsp;';
}
print '</td></tr>';
@@ -5495,8 +5499,6 @@ if ($action == 'create') {
print '<td><td class="right">';
if ($usercancreate) {
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
} else {
print '&nbsp;';
}
print '</td></tr></table>';
print '</td>';
@@ -5509,6 +5511,30 @@ if ($action == 'create') {
print '</td></tr>';
}
// Dispute open
print '<tr><td>';
print '<table class="nobordernopadding centpercent"><tr><td>';
print $langs->trans('DisputeOpen');
print '<td><td class="right">';
if ($usercancreate) {
print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editdispute_status&token='.newToken().'">'.img_edit().'</a>';
}
print '</td></tr></table>';
print '</td><td>';
if ($action != 'editdispute_status') {
print '<input type="checkbox" value="1" disabled="disabled"'.($object->dispute_status ? ' checked="checked"' : '').'>';
} else {
print '<form enctype="multipart/form-data" action="'.DOL_URL_ROOT.'/compta/facture/card.php" method="POST">';
print '<input type="hidden" name="action" value="set_dispute_status">';
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="">';
print '<input type="checkbox" name="dispute_status" value="1" class="valignmiddle"'.($object->dispute_status ? ' checked="checked"' : '').'>';
print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Save").'">';
print '</form>';
}
print '</td></tr>';
// Categories
if (isModEnabled('category')) {
print '<tr><td>';
@@ -6061,6 +6087,7 @@ if ($action == 'create') {
$resteapayeraffiche = $resteapayer;
$cssforamountpaymentcomplete = 'amountpaymentcomplete';
$cssforamountpaymentcompletenoresize = 'amountpaymentcompletenoresize';
// Loop on each credit note or deposit amount applied
$creditnoteamount = 0;
@@ -6115,6 +6142,7 @@ if ($action == 'create') {
print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$cssforamountpaymentcompletenoresize = 'amountpaymentneutralnoresize';
}
// Partially paid or abandoned 'badcustomer'
if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') {
@@ -6125,6 +6153,7 @@ if ($action == 'create') {
print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</td><td>&nbsp;</td></tr>';
// $resteapayeraffiche=0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$cssforamountpaymentcompletenoresize = 'amountpaymentneutralnoresize';
}
// Partially paid or abandoned 'product_returned'
if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') {
@@ -6135,6 +6164,7 @@ if ($action == 'create') {
print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$cssforamountpaymentcompletenoresize = 'amountpaymentneutralnoresize';
}
// Partially paid or abandoned 'abandoned'
if (($object->status == Facture::STATUS_CLOSED || $object->status == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') {
@@ -6150,6 +6180,7 @@ if ($action == 'create') {
print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
$resteapayeraffiche = 0;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$cssforamountpaymentcompletenoresize = 'amountpaymentneutralnoresize';
}
// Billed
@@ -6178,7 +6209,7 @@ if ($action == 'create') {
}
print '</span>';
print '</td>';
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">';
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopaynoresize' : (' '.$cssforamountpaymentcompletenoresize)).'">';
//print (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code).' ';
print price(price2num($object->multicurrency_tx * $resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).'</td><td>&nbsp;</td></tr>';
}
@@ -6195,10 +6226,10 @@ if ($action == 'create') {
$billedWithRetainedWarranty = $object->total_ttc - $retainedWarranty;
print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("ToPayOn", dol_print_date($object->date_lim_reglement, 'day')).' :</td><td align="right">'.price($billedWithRetainedWarranty).'</td><td>&nbsp;</td></tr>';
// retained warranty
print '<tr><td colspan="'.$nbcols.'" align="right">';
print '<tr><td colspan="'.$nbcols.'" class="right">';
print $langs->trans("RetainedWarranty").' ('.$object->retained_warranty.'%)';
print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
@@ -6206,6 +6237,7 @@ if ($action == 'create') {
} else { // Credit note
$resteapayeraffiche = $resteapayer;
$cssforamountpaymentcomplete = 'amountpaymentneutral';
$cssforamountpaymentcompletenoresize = 'amountpaymentneutralnoresize';
// Total already paid back
print '<tr><td colspan="'.$nbcols.'" class="right">';
@@ -6234,7 +6266,7 @@ if ($action == 'create') {
}
print '</span>';
print '</td>';
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT')).'</td><td>&nbsp;</td></tr>';
print '<td class="right'.($resteapayeraffiche ? ' amountremaintopaybacknoresize' : (' '.$cssforamountpaymentcompletenoresize)).'">'.price(price2num($sign * $object->multicurrency_tx * $resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).'</td><td>&nbsp;</td></tr>';
}
// Sold credit note

10
htdocs/core/class/commoninvoice.class.php
View File

@@ -940,6 +940,7 @@ abstract class CommonInvoice extends CommonObject
'nbofopendirectdebitorcredittransfer' => $this->nbofopendirectdebitorcredittransfer,
'close_code' => $this->close_code,
'close_note' => $this->close_note,
'dispute_status' => $this->dispute_status
);
return $this->LibStatut($this->paye, $this->status, $mode, $alreadypaid, $this->type, $moreparams);
@@ -1056,7 +1057,14 @@ abstract class CommonInvoice extends CommonObject
$paramsbutton = array();
}
return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $paramsbutton);
/*
if (isset($moreparams['dispute_status'])) {
$statusdispute = $moreparams['dispute_status'] ? img_picto($langs->trans("aa"), 'warning') : '';
}
*/
$statusbadge = dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', $paramsbutton);
return $statusbadge;
}
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

6
htdocs/core/class/commonobject.class.php
View File

@@ -777,19 +777,19 @@ abstract class CommonObject
/**
* @var float Amount already paid from getSommePaiement() + getSumCreditNotesUsed() + getSumDepositsUsed() (used to show correct status)
* @var ?float Amount already paid from getSommePaiement() + getSumCreditNotesUsed() + getSumDepositsUsed() (used to show correct status)
* @see $totalpaid
*/
public $alreadypaid;
/**
* @var float Amount already paid from getSommePaiement()
* @var ?float Amount already paid from getSommePaiement()
* @see $alreadpaid, $totalpaid_multicurrency
*/
public $totalpaid;
/**
* @var int|float Amount already paid from getSommePaiement(), like $totalpaid, but in the foreign currency
* @var ?int|?float Amount already paid from getSommePaiement(), like $totalpaid, but in the foreign currency
* @see $totalpaid, $alreadypaid
*/
public $totalpaid_multicurrency;

17
htdocs/core/lib/functions.lib.php
View File

@@ -3413,18 +3413,21 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$tmptxt = $object->getLibStatut(5, $object->alreadypaid);
}
$morehtmlstatus .= $tmptxt;
} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier'))) { // TODO Move this to use ->alreadypaid
} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier'))) {
/** @var Facture|FactureFournisseur|CommonInvoice $object */
'@phan-var-force Facture|FactureFournisseur|CommonInvoice $object';
$totalallpayments = $object->getSommePaiement(0);
$totalallpayments += $object->getSumCreditNotesUsed(0);
$totalallpayments += $object->getSumDepositsUsed(0);
$tmptxt = $object->getLibStatut(6, $totalallpayments);
if (!isset($object->alreadypaid)) {
$object->totalpaid = $object->getSommePaiement(0);
$object->totalcreditnotes = $object->getSumCreditNotesUsed(0);
$object->totaldeposits = $object->getSumDepositsUsed(0);
$object->alreadypaid = $object->totalpaid + $object->totalcreditnotes + $object->totaldeposits;
}
$tmptxt = $object->getLibStatut(6, $object->alreadypaid);
if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
$tmptxt = $object->getLibStatut(5, $totalallpayments);
$tmptxt = $object->getLibStatut(5, $object->alreadypaid);
}
$morehtmlstatus .= $tmptxt;
} elseif (in_array($object->element, array('chargesociales', 'loan', 'tva'))) { // TODO Move this to use ->alreadypaid
} elseif (in_array($object->element, array('chargesociales', 'loan', 'tva'))) { // TODO Move this to use ->alreadypaid like for invoices
/** @var ChargeSociales|Loan|Tva $object */
'@phan-var-force ChargeSociales|Loan|Tva $object';
$tmptxt = $object->getLibStatut(6, $object->totalpaid);

15
htdocs/theme/eldy/global.inc.php
View File

@@ -1803,23 +1803,38 @@ table.paymenttable td.amountpaymentcomplete, table.paymenttable td.amountremaint
font-size: 1.7em;
white-space: nowrap;
}
.amountpaymentcompletenoresize {
color: var(--amountpaymentcomplete);
white-space: nowrap;
}
.amountremaintopay {
color: var(--amountremaintopaycolor);
font-weight: bold;
font-size: 1.7em;
white-space: nowrap;
}
.amountremaintopaynoresize {
color: var(--amountremaintopaycolor);
white-space: nowrap;
}
.amountremaintopayback {
color: var(--amountremaintopaybackcolor);
font-weight: bold;
font-size: 1.7em;
white-space: nowrap;
}
.amountremaintopaybacknoresize {
color: var(--amountremaintopaybackcolor);
white-space: nowrap;
}
.amountpaymentneutral {
font-weight: bold;
font-size: 1.7em;
white-space: nowrap;
}
.amountpaymentneutralnoresize {
white-space: nowrap;
}
.onlinepaymentbody .amountpaymentcomplete {

15
htdocs/theme/md/style.css.php
View File

@@ -1952,21 +1952,36 @@ select.flat.selectlimit {
font-weight: bold;
white-space: nowrap;
}
.amountpaymentcompletenoresize {
color: var(--amountpaymentcomplete);
white-space: nowrap;
}
.amountremaintopay {
color: var(--amountremaintopaycolor);
font-weight: bold;
white-space: nowrap;
}
.amountremaintopaynoresize {
color: var(--amountremaintopaycolor);
white-space: nowrap;
}
.amountremaintopayback {
font-weight: bold;
white-space: nowrap;
}
.amountremaintopaybacknoresize {
white-space: nowrap;
}
.amountpaymentneutral {
color: var(--amountremaintopaybackcolor);
font-weight: bold;
font-size: 1.4em;
white-space: nowrap;
}
.amountpaymentneutralnoresize {
color: var(--amountremaintopaybackcolor);
white-space: nowrap;
}
.onlinepaymentbody .amountpaymentcomplete {
background-color: var(--amountpaymentcomplete);