lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24019 from grandoc/new_branch_23_02_2023

Browse Source 
fix : Warning: Undefined property: Conf:: in /home/httpd/vhosts/aflac…
This commit is contained in:
Laurent Destailleur 2023-02-23 20:04:08 +01:00 committed by GitHub
commit 6000b4830a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contrat/card.php
View File

@ -1649,9 +1649,9 @@ if ($action == 'create') {
if ($objp->subprice >= 0) {
$colspan = 6;
if ($conf->margin->enabled && getDolGlobalString('PRODUCT_USE_UNITS')) {
if (isModEnabled('margin') && getDolGlobalString('PRODUCT_USE_UNITS')) {
$colspan = 8;
} elseif ($conf->margin->enabled || getDolGlobalString('PRODUCT_USE_UNITS')) {
} elseif (isModEnabled('margin') || getDolGlobalString('PRODUCT_USE_UNITS')) {
$colspan = 7;
}