Merge pull request #23375 from grandoc/new_branch_30_12_2022

update code toward php8 compliance
This commit is contained in:
Laurent Destailleur
2023-01-04 08:33:25 +01:00
committed by GitHub
22 changed files with 51 additions and 51 deletions

View File

@@ -173,7 +173,7 @@ class pdf_einstein extends ModelePDFCommandes
// Define position of columns
$this->posxdesc = $this->marge_gauche + 1;
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->posxtva = 101;
$this->posxup = 118;
$this->posxqty = 135;
@@ -509,7 +509,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
// Unit
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
$pdf->SetXY($this->posxunit, $curY);
$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -1238,7 +1238,7 @@ class pdf_einstein extends ModelePDFCommandes
$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
}
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
if (empty($hidetop)) {
$pdf->SetXY($this->posxunit - 1, $tab_top + 1);

View File

@@ -1866,7 +1866,7 @@ class pdf_eratosthene extends ModelePDFCommandes
),
'border-left' => true, // add left line separator
);
if (!empty($conf->global->PRODUCT_USE_UNITS)) {
if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
$this->cols['unit']['status'] = true;
}