Merge pull request #26058 from defrance/patch-276

FIX : Bad hidden variable Name
This commit is contained in:
Laurent Destailleur 2023-09-28 22:54:49 +02:00 committed by GitHub
commit 24b2dd805b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4,6 +4,7 @@
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2020 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2023 Charlene Benke <charlene@patas-monkey.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -1284,7 +1285,7 @@ class pdf_espadon extends ModelePdfExpedition
$this->cols['subprice'] = array(
'rank' => $rank,
'width' => 19, // in mm
'status' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
'status' => !empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT) ? 1 : 0,
'title' => array(
'textkey' => 'PriceUHT'
),
@ -1295,7 +1296,7 @@ class pdf_espadon extends ModelePdfExpedition
$this->cols['totalexcltax'] = array(
'rank' => $rank,
'width' => 26, // in mm
'status' => !empty($conf->global->MAIN_PDF_SHIPPING_DISPLAY_AMOUNT_HT) ? 1 : 0,
'status' => !empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT) ? 1 : 0,
'title' => array(
'textkey' => 'TotalHT'
),