Dolibarr
/
dolibarr-swissqr-mirror
mirror of https://github.com/sinabe/dolibarr-swissqr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master

This commit is contained in:
Benoit Vianin 2023-03-16 10:10:58 +01:00
parent 298de15213 f46bb28387
commit 8129522876
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/modules/facture/doc/pdf_swissqr.modules.php
View File

@ -460,7 +460,8 @@ class pdf_swissqr extends ModelePDFFactures
if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) { if (! empty($conf->global->INVOICE_ADD_ZATCA_QR_CODE)) {
$qrcodestring = $object->buildZATCAQRString(); $qrcodestring = $object->buildZATCAQRString();
} elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) { } elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
$qrcodestring = $object->buildSwitzerlandQRString(); // Do not allow another QR code; this module is about having the legit one.
// $qrcodestring = $object->buildSwitzerlandQRString();
} }
if ($qrcodestring) { if ($qrcodestring) {
$qrcodecolor = array('25', '25', '25'); $qrcodecolor = array('25', '25', '25');
@ -859,6 +860,7 @@ class pdf_swissqr extends ModelePDFFactures
{ {
$pdf->AddPage(); $pdf->AddPage();
$this->_pagehead($pdf, $object, 0, $outputlangs); $this->_pagehead($pdf, $object, 0, $outputlangs);
$pdf->SetTextColor(0, 0, 0);
$this->qrinvoice($pdf, $object, $outputlangs, $conf); $this->qrinvoice($pdf, $object, $outputlangs, $conf);
} }