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

Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 22.0

Browse Source
This commit is contained in:
Laurent Destailleur
2025-11-24 16:18:01 +01:00
parent 0aa6652005 d5a438ff00
commit c096fd29e4
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/comm/propal/class/propal.class.php
View File

@@ -2206,7 +2206,6 @@ class Propal extends CommonObject
$this->ref = $num;
$this->statut = self::STATUS_VALIDATED;
$this->status = self::STATUS_VALIDATED;
$this->user_validation_id = $user->id;
$this->datev = $now;
$this->date_validation = $now;

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

@@ -1899,6 +1899,9 @@ abstract class CommonInvoice extends CommonObject
// Get the amount to pay
$amount_to_pay = $this->getRemainToPay();
// Prevent negative values (e.g. overpayments)
$amount_to_pay = max(0, $amount_to_pay);
// Ensure numeric formatting for EPC QR code
$amount_to_pay = price2num($amount_to_pay, 'MT');

1
htdocs/core/class/html.formsetup.class.php
View File

@@ -268,7 +268,6 @@ class FormSetup
$this->errors = $hookmanager->errors;
return -1;
}
if ($reshook > 0) {
return $reshook;
}

2
htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
View File

@@ -473,7 +473,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
$message_customer .= '<p>'.$langs->trans('Message').' : <br><br>'.$message.'</p><br>';
if (getDolGlobalInt('TICKET_ENABLE_PUBLIC_INTERFACE')) {
$url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 2)).'view.php?track_id='.((int) $object->track_id);
$url_public_ticket = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 2)).'view.php?track_id='.urlencode($object->track_id);
$message_customer .= '<p>'.$langs->trans($see_ticket).' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
} else {