diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e926611ccd48912e5aea24c3ced037300ad1e338..9522a45c383e3caa485998575b1697c39fd5bd50 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -125,7 +125,7 @@ class Categorie extends CommonObject 'contact' => 'socpeople', 'user' => 'user', 'account' => 'bank_account', - 'project' => 'project', + 'project' => 'projet', ); public $element='category'; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index fdde86ff1f9ebf063250c7a3e2c534bf714b18a1..4411061e0c0309b78c6804639eb1cd4bc2e68639 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -657,6 +657,61 @@ if ($object->type == Categorie::TYPE_ACCOUNT) } } +// List of Project +if ($object->type == Categorie::TYPE_PROJECT) +{ + require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; + + $projects = $object->getObjectsInCateg("project"); + if ($projects < 0) + { + dol_print_error($db, $object->error, $object->errors); + } + else + { + print "<br>"; + print "<table class='noborder' width='100%'>\n"; + print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Project")."</td></tr>\n"; + + if (count($projects) > 0) + { + $var=true; + foreach ($projects as $key => $project) + { + $var=!$var; + print "\t<tr ".$bc[$var].">\n"; + print '<td class="nowrap" valign="top">'; + print $project->getNomUrl(1,0); + print "</td>\n"; + print '<td valign="top">'.$project->ref."</td>\n"; + print '<td valign="top">'.$project->title."</td>\n"; + // Link to delete from category + print '<td align="right">'; + $typeid=$object->type; + $permission=0; + if ($typeid == Categorie::TYPE_PRODUCT) $permission=($user->rights->produit->creer || $user->rights->service->creer); + if ($typeid == Categorie::TYPE_SUPPLIER) $permission=$user->rights->societe->creer; + if ($typeid == Categorie::TYPE_CUSTOMER) $permission=$user->rights->societe->creer; + if ($typeid == Categorie::TYPE_MEMBER) $permission=$user->rights->adherent->creer; + if ($typeid == Categorie::TYPE_ACCOUNT) $permission=$user->rights->banque->configurer; + if ($typeid == Categorie::TYPE_PROJECT) $permission=$user->rights->projet->creer; + if ($permission) + { + print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid)?'id':'socid')."=".$object->id."&type=".$typeid."&removeelem=".$project->id."'>"; + print img_delete($langs->trans("DeleteFromCat")).' '; + print $langs->trans("DeleteFromCat")."</a>"; + } + print "</tr>\n"; + } + } + else + { + print '<tr '.$bc[false].'><td colspan="3" class="opacitymedium">'.$langs->trans("ThisCategoryHasNoProject").'</td></tr>'; + } + print "</table>\n"; + } +} + llxFooter(); $db->close(); diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 351a730104f13116ded80becf64daff891e8d67f..1008cd5bd6873787b1064f5f3b227a08dd3bdb1f 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -14,7 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area MembersCategoriesArea=Members tags/categories area ContactsCategoriesArea=Contacts tags/categories area AccountsCategoriesArea=Accounts tags/categories area -PeojectCategoriesArea=Projects tags/categories area +ProjectsCategoriesArea=Projects tags/categories area SubCats=Subcategories CatList=List of tags/categories NewCategory=New tag/category