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

New: Enhancement in category module

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-20 13:12:00 +00:00
parent 95f44eb1bc
commit 10f1df53e0
4 changed files with 63 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
htdocs/categories/categorie.php
View File

@ -89,6 +89,7 @@ if ($_REQUEST["removecat"])
{ {
if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
require_once(DOL_DOCUMENT_ROOT."/product.class.php");
$object = new Product($db); $object = new Product($db);
if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]); if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]);
if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]); if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]);
@ -106,6 +107,7 @@ if ($_REQUEST["removecat"])
} }
if ($_REQUEST["typeid"] == 3 && $user->rights->adherent->creer) if ($_REQUEST["typeid"] == 3 && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
$object = new Adherent($db); $object = new Adherent($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
} }
@ -119,9 +121,11 @@ if ($_REQUEST["removecat"])
if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
{ {
$_GET["id"]=$_REQUEST["id"]; $_GET["id"]=$_REQUEST["id"];
$_GET["type"]=$_REQUEST["type"];
if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
require_once(DOL_DOCUMENT_ROOT."/product.class.php");
$object = new Product($db); $object = new Product($db);
if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]); if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]);
if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]); if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]);
@ -141,6 +145,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
} }
if ($_REQUEST["typeid"]==3 && $user->rights->adherent->creer) if ($_REQUEST["typeid"]==3 && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
$object = new Adherent($db); $object = new Adherent($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
$type = 'member'; $type = 'member';
@ -181,14 +186,14 @@ if ($_GET["socid"])
/* /*
* Creation de l'objet client/fournisseur correspondant au socid * Creation de l'objet client/fournisseur correspondant au socid
*/ */
$soc = new Societe($db); $soc = new Societe($db);
$result = $soc->fetch($_GET["socid"]); $result = $soc->fetch($_GET["socid"]);
llxHeader("","",$langs->trans("Category")); llxHeader("","",$langs->trans("Category"));
/* /*
* Affichage onglets * Affichage onglets
*/ */
$head = societe_prepare_head($soc); $head = societe_prepare_head($soc);
dol_fiche_head($head, 'category', $langs->trans("ThirdParty"),0,'company'); dol_fiche_head($head, 'category', $langs->trans("ThirdParty"),0,'company');
@ -268,9 +273,11 @@ else if ($_GET["id"] || $_GET["ref"])
{ {
if ($_GET["type"] == 0) if ($_GET["type"] == 0)
{ {
/* $langs->load("products");
* Fiche categorie de produit
*/ /*
* Fiche categorie de produit
*/
require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
require_once(DOL_DOCUMENT_ROOT."/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php");
@ -316,43 +323,57 @@ else if ($_GET["id"] || $_GET["ref"])
if ($_GET["type"] == 3) if ($_GET["type"] == 3)
{ {
/* $langs->load("members");
* Fiche categorie d'adherent
*/ /*
* Fiche categorie d'adherent
*/
require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
// Produit // Produit
$member = new Adherent($db); $member = new Adherent($db);
if ($_GET["ref"]) $result = $member->fetch('',$_GET["ref"]); if ($_GET["ref"]) $result = $member->fetch('',$_GET["ref"]);
if ($_GET["id"]) $result = $member->fetch($_GET["id"]); if ($_GET["id"]) $result = $member->fetch($_GET["id"]);
llxHeader("","",$langs->trans("CardMember")); $adht = new AdherentType($db);
$adht->fetch($member->typeid);
llxHeader("","",$langs->trans("Member"));
$head=member_prepare_head($product, $user); $head=member_prepare_head($member, $user);
$titre=$langs->trans("CardMember"); $titre=$langs->trans("Member");
$picto='member'; $picto='user';
dol_fiche_head($head, 'category', $titre,0,$picto); dol_fiche_head($head, 'category', $titre,0,$picto);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>";
// Reference
print '<td width="15%">'.$langs->trans("Ref").'</td><td>';
print $html->showrefnav($member,'ref','',1,'ref');
print '</td>';
print '</tr>';
// Libelle // Ref
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$member->libelle.'</td>'; print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
print '</tr>'; print '<td class="valeur">';
print $html->showrefnav($member,'rowid');
// Statut
print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
print $member->getLibStatut(2);
print '</td></tr>'; print '</td></tr>';
// Nom
print '<tr><td>'.$langs->trans("Lastname").'</td><td class="valeur">'.$member->nom.'&nbsp;</td>';
print '</tr>';
// Prenom
print '<tr><td>'.$langs->trans("Firstname").'</td><td class="valeur">'.$member->prenom.'&nbsp;</td>';
print '</tr>';
// Login
print '<tr><td>'.$langs->trans("Login").'</td><td class="valeur">'.$member->login.'&nbsp;</td></tr>';
// Type
print '<tr><td>'.$langs->trans("Type").'</td><td class="valeur">'.$adht->getNomUrl(1)."</td></tr>\n";
// Status
print '<tr><td>'.$langs->trans("Status").'</td><td class="valeur">'.$member->getLibStatut(4).'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';
@ -382,6 +403,7 @@ function formCategory($db,$object,$typeid)
print '<form method="post" action="'.DOL_URL_ROOT.'/categories/categorie.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/categories/categorie.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="typeid" value="'.$typeid.'">'; print '<input type="hidden" name="typeid" value="'.$typeid.'">';
print '<input type="hidden" name="type" value="'.$typeid.'">';
print '<input type="hidden" name="id" value="'.$object->id.'">'; print '<input type="hidden" name="id" value="'.$object->id.'">';
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre"><td>';
@ -438,7 +460,7 @@ function formCategory($db,$object,$typeid)
if ($typeid == 3) $permission=$user->rights->adherent->creer; if ($typeid == 3) $permission=$user->rights->adherent->creer;
if ($permission) if ($permission)
{ {
print "<a href= '".DOL_URL_ROOT."/categories/categorie.php?".(empty($_REQUEST["socid"])?'id':'socid')."=".$object->id.(empty($_REQUEST["socid"])?"&amp;typeid=".$typeid:'')."&amp;removecat=".$cat->id."'>"; print "<a href= '".DOL_URL_ROOT."/categories/categorie.php?".(empty($_REQUEST["socid"])?'id':'socid')."=".$object->id.(empty($_REQUEST["socid"])?"&amp;type=".$typeid."&amp;typeid=".$typeid:'')."&amp;removecat=".$cat->id."'>";
print img_delete($langs->trans("DeleteFromCat")).' '; print img_delete($langs->trans("DeleteFromCat")).' ';
print $langs->trans("DeleteFromCat")."</a>"; print $langs->trans("DeleteFromCat")."</a>";
} }

1
htdocs/langs/en_US/categories.lang
View File

@ -52,6 +52,7 @@ CompanyIsInSuppliersCategories=This third party owns to following suppliers cate
ProductHasNoCategory=This product/service is not in any categories ProductHasNoCategory=This product/service is not in any categories
SupplierHasNoCategory=This supplier is not in any categories SupplierHasNoCategory=This supplier is not in any categories
CompanyHasNoCategory=This company is not in any categories CompanyHasNoCategory=This company is not in any categories
MemberHasNoCategory=This member is not in any categories
ClassifyInCategory=Classify in category ClassifyInCategory=Classify in category
NoneCategory=None NoneCategory=None
CategoryExistsAtSameLevel=This category already exists with this ref CategoryExistsAtSameLevel=This category already exists with this ref

1
htdocs/langs/fr_FR/categories.lang
View File

@ -52,6 +52,7 @@ CompanyIsInSuppliersCategories=Cette société est dans les catégories fourniss
ProductHasNoCategory=Ce produit/service n'est dans aucune catégorie en particulier ProductHasNoCategory=Ce produit/service n'est dans aucune catégorie en particulier
SupplierHasNoCategory=Ce fournisseur n'est dans aucune catégorie en particulier SupplierHasNoCategory=Ce fournisseur n'est dans aucune catégorie en particulier
CompanyHasNoCategory=Cette société n'est dans aucune catégorie en particulier CompanyHasNoCategory=Cette société n'est dans aucune catégorie en particulier
MemberHasNoCategory=Cet adhérent n'est dans aucune catégorie en particulier
ClassifyInCategory=Classer dans la catégorie ClassifyInCategory=Classer dans la catégorie
NoneCategory=Aucune NoneCategory=Aucune
CategoryExistsAtSameLevel=Cette catégorie existe déjà pour cette référence CategoryExistsAtSameLevel=Cette catégorie existe déjà pour cette référence

9
htdocs/lib/member.lib.php
View File

@ -55,6 +55,15 @@ function member_prepare_head($member)
$h++; $h++;
} }
// Show category tab
if ($conf->categorie->enabled && $user->rights->categorie->lire)
{
$head[$h][0] = DOL_URL_ROOT."/categories/categorie.php?id=".$member->id.'&type=3';
$head[$h][1] = $langs->trans('Categories');
$head[$h][2] = 'category';
$h++;
}
$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$member->id; $head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$member->id;
$head[$h][1] = $langs->trans("Note"); $head[$h][1] = $langs->trans("Note");
$head[$h][2] = 'note'; $head[$h][2] = 'note';