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

FIX issue 15659 : Missing test if conf is enabled

Browse Source
This commit is contained in:
quentin 2021-01-06 09:54:02 +01:00
parent 58e33c59f4
commit 7161ca9e70
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/societe/card.php
View File

@ -1542,12 +1542,12 @@ else
//} //}
// Supplier // Supplier
//if ($object->fournisseur) { if (!empty($conf->fournisseur->enabled)) {
print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">'; print '<tr class="visibleifsupplier"><td class="toptd">'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td><td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1); $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, 'parent', null, null, 1);
print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%"); print $form->multiselectarray('suppcats', $cate_arbo, GETPOST('suppcats', 'array'), null, null, null, null, "90%");
print "</td></tr>"; print "</td></tr>";
//} }
} }
// Multicurrency // Multicurrency
@ -2180,18 +2180,20 @@ else
print "</td></tr>"; print "</td></tr>";
// Supplier // Supplier
if (!empty($conf->fournisseur->enabled)) {
print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>'; print '<tr class="visibleifsupplier"><td>'.$form->editfieldkey('SuppliersCategoriesShort', 'suppcats', '', $object, 0).'</td>';
print '<td colspan="3">'; print '<td colspan="3">';
$cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1); $cate_arbo = $form->select_all_categories(Categorie::TYPE_SUPPLIER, null, null, null, null, 1);
$c = new Categorie($db); $c = new Categorie($db);
$cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER); $cats = $c->containing($object->id, Categorie::TYPE_SUPPLIER);
$arrayselected = array(); $arrayselected = array();
foreach ($cats as $cat) { foreach($cats as $cat) {
$arrayselected[] = $cat->id; $arrayselected[] = $cat->id;
} }
print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%'); print $form->multiselectarray('suppcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
print "</td></tr>"; print "</td></tr>";
} }
}
// Multicurrency // Multicurrency
if (!empty($conf->multicurrency->enabled)) if (!empty($conf->multicurrency->enabled))
@ -2560,7 +2562,7 @@ else
} }
// Supplier // Supplier
if ($object->fournisseur) { if (!empty($conf->fournisseur->enabled) && $object->fournisseur) {
print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>'; print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
print '<td>'; print '<td>';
print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1); print $form->showCategories($object->id, Categorie::TYPE_SUPPLIER, 1);