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

Merge pull request #2766 from aternatik/fix_product_cat

Browse Source 
Fix : missing link to category into product card.
This commit is contained in:
Juanjo Menent 2015-05-05 20:17:17 +02:00
commit 65d736cb68
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/categories/edit.php
View File

@ -37,7 +37,7 @@ $action=GETPOST('action');
$confirm=GETPOST('confirm'); $confirm=GETPOST('confirm');
$socid=GETPOST('socid','int'); $socid=GETPOST('socid','int');
$nom=GETPOST('nom'); $label=GETPOST('label');
$description=GETPOST('description'); $description=GETPOST('description');
$visible=GETPOST('visible'); $visible=GETPOST('visible');
$parent=GETPOST('parent'); $parent=GETPOST('parent');
@ -66,7 +66,7 @@ if ($action == 'update' && $user->rights->categorie->creer)
$categorie = new Categorie($db); $categorie = new Categorie($db);
$result=$categorie->fetch($id); $result=$categorie->fetch($id);
$categorie->label = $nom; $categorie->label = $label;
$categorie->description = dol_htmlcleanlastbr($description); $categorie->description = dol_htmlcleanlastbr($description);
$categorie->socid = ($socid ? $socid : 'null'); $categorie->socid = ($socid ? $socid : 'null');
$categorie->visible = $visible; $categorie->visible = $visible;
@ -138,12 +138,12 @@ print '<table class="border" width="100%">';
// Ref // Ref
print '<tr><td class="fieldrequired">'; print '<tr><td class="fieldrequired">';
print $langs->trans("Ref").'</td>'; print $langs->trans("Ref").'</td>';
print '<td><input type="text" size="25" id="nom" name ="nom" value="'.$object->label.'" />'; print '<td><input type="text" size="25" id="label" name ="label" value="'.$object->label.'" />';
print '</tr>'; print '</tr>';
// Description // Description
print '<tr>'; print '<tr>';
print '<td width="25%">'.$langs->trans("Description").'</td>'; print '<td class="fieldrequired" width="25%">'.$langs->trans("Description").'</td>';
print '<td >'; print '<td >';
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50); $doleditor=new DolEditor('description',$object->description,'',200,'dolibarr_notes','',false,true,$conf->fckeditor->enabled,ROWS_6,50);

2
htdocs/product/card.php
View File

@ -1586,7 +1586,7 @@ else
// Categories // Categories
print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">'; print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
print $form->showCategories($object->id,'product'); print $form->showCategories($object->id,'product',1);
print "</td></tr>"; print "</td></tr>";
print "</table>\n"; print "</table>\n";