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

Merge pull request #14891 from inoveaconseil/Newhidelabelvariant

Browse Source 
NEW hide label in pdf for variants
This commit is contained in:
Laurent Destailleur 2020-10-02 13:45:52 +02:00 committed by GitHub
commit 00cb3277ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/pdf.lib.php
View File

@ -11,6 +11,7 @@
* Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com>
* Copyright (C) 2015-2016 Marcos García <marcosgdf@gmail.com> * Copyright (C) 2015-2016 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2019 Lenin Rivas <lenin.rivas@servcom-it.com> * Copyright (C) 2019 Lenin Rivas <lenin.rivas@servcom-it.com>
* Copyright (C) 2020 Nicolas ZABOURI <info@inovea-conseil.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -1314,10 +1315,14 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST)) if (!empty($conf->global->MAIN_DOCUMENTS_DESCRIPTION_FIRST))
{ {
$libelleproduitservice = $desc."\n".$libelleproduitservice; $libelleproduitservice = $desc."\n".$libelleproduitservice;
} else {
if (!empty($conf->global->HIDE_LABEL_VARIANT_PDF) && $prodser->isVariant()) {
$libelleproduitservice = $desc;
} else { } else {
$libelleproduitservice .= $desc; $libelleproduitservice .= $desc;
} }
} }
}
} else { } else {
$libelleproduitservice .= $desc; $libelleproduitservice .= $desc;
} }