Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-12 10:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility

Browse Source 
Conflicts:
	htdocs/resource/class/dolresource.class.php
This commit is contained in:
Laurent Destailleur
2024-02-08 00:24:27 +01:00
parent ad141c1e1f
commit 550e4e8c9a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/facture/modules_facture.php
View File

@@ -196,7 +196,7 @@ abstract class ModelePDFFactures extends CommonDocGenerator
* @param Translate $langs Translation object
* @return int Height in mm of the bottom-page QR invoice. Can be zero if not on right page; not enabled
*/
protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs): int
protected function getHeightForQRInvoice(int $pagenbr, Facture $object, Translate $langs)
{
if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') {
// Keep it, to reset it after QRinvoice getter

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

@@ -88,7 +88,7 @@ class InterfaceLogevents extends DolibarrTriggers
* @return int if KO: <0, if no trigger ran: 0, if OK: >0
* @throws Exception dol_syslog can throw Exceptions
*/
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf): int
public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
{
if (getDolGlobalString('MAIN_LOGEVENTS_DISABLE_ALL')) {
return 0; // Log events is disabled (hidden features)