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

Merge pull request #12583 from atm-maxime/fix_supplier_proddesc

Browse Source 
Fix #12044 : with replenish function, use product supplier desc in order
This commit is contained in:
Laurent Destailleur 2019-12-01 11:51:22 +01:00 committed by GitHub
commit 87e81f1afd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/stock/replenish.php
View File

@ -147,7 +147,13 @@ if ($action == 'order' && isset($_POST['valid']))
{
$productsupplier->getMultiLangs();
}
$line->desc = $productsupplier->description;
// if we use supplier description of the products
if(!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
$desc = $productsupplier->desc_supplier;
} else $desc = $productsupplier->description;
$line->desc = $desc;
if (! empty($conf->global->MAIN_MULTILANGS))
{
// TODO Get desc in language of thirdparty