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

FIX #3529

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-16 21:21:34 +02:00
parent 7f60abdf7b
commit e36928fd65
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -3015,6 +3015,8 @@ class Form
global $langs; global $langs;
$langs->load("categories"); $langs->load("categories");
include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php';
$cat = new Categorie($this->db); $cat = new Categorie($this->db);
$cate_arbo = $cat->get_full_arbo($type,$excludeafterid); $cate_arbo = $cat->get_full_arbo($type,$excludeafterid);
@ -4673,6 +4675,8 @@ class Form
{ {
global $db; global $db;
include_once DOL_DOCUMENT_ROOT.'/categories/class.categorie.class.php';
$cat = new Categorie($db); $cat = new Categorie($db);
$categories = $cat->containing($id, $type); $categories = $cat->containing($id, $type);

3
htdocs/fourn/card.php
View File

@ -264,10 +264,13 @@ if ($object->id > 0)
print '</tr>'; print '</tr>';
// Categories // Categories
if (! empty($conf->categorie->enabled))
{
print '<tr><td>' . $langs->trans("Categories") . '</td>'; print '<tr><td>' . $langs->trans("Categories") . '</td>';
print '<td colspan="3">'; print '<td colspan="3">';
print $form->showCategories($object->id, 'supplier', 1); print $form->showCategories($object->id, 'supplier', 1);
print "</td></tr>"; print "</td></tr>";
}
// Other attributes // Other attributes
$parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3'); $parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');