diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 67af3432a17..e5c302b8baf 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -89,6 +89,7 @@ if ($_REQUEST["removecat"]) { if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) { + require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $object = new Product($db); if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]); if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]); @@ -106,6 +107,7 @@ if ($_REQUEST["removecat"]) } if ($_REQUEST["typeid"] == 3 && $user->rights->adherent->creer) { + require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); $object = new Adherent($db); $result = $object->fetch($objectid); } @@ -119,9 +121,11 @@ if ($_REQUEST["removecat"]) if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) { $_GET["id"]=$_REQUEST["id"]; + $_GET["type"]=$_REQUEST["type"]; if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) { + require_once(DOL_DOCUMENT_ROOT."/product.class.php"); $object = new Product($db); if ($_REQUEST["ref"]) $result = $object->fetch('',$_REQUEST["ref"]); 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) { + require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); $object = new Adherent($db); $result = $object->fetch($objectid); $type = 'member'; @@ -181,14 +186,14 @@ if ($_GET["socid"]) /* * Creation de l'objet client/fournisseur correspondant au socid */ - $soc = new Societe($db); - $result = $soc->fetch($_GET["socid"]); - llxHeader("","",$langs->trans("Category")); + $soc = new Societe($db); + $result = $soc->fetch($_GET["socid"]); + llxHeader("","",$langs->trans("Category")); - /* - * Affichage onglets - */ + /* + * Affichage onglets + */ $head = societe_prepare_head($soc); dol_fiche_head($head, 'category', $langs->trans("ThirdParty"),0,'company'); @@ -268,9 +273,11 @@ else if ($_GET["id"] || $_GET["ref"]) { if ($_GET["type"] == 0) { - /* - * Fiche categorie de produit - */ + $langs->load("products"); + + /* + * Fiche categorie de produit + */ require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php"); require_once(DOL_DOCUMENT_ROOT."/product.class.php"); @@ -316,43 +323,57 @@ else if ($_GET["id"] || $_GET["ref"]) if ($_GET["type"] == 3) { - /* - * Fiche categorie d'adherent - */ + $langs->load("members"); + + /* + * Fiche categorie d'adherent + */ 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_type.class.php"); // Produit $member = new Adherent($db); if ($_GET["ref"]) $result = $member->fetch('',$_GET["ref"]); 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); - $titre=$langs->trans("CardMember"); - $picto='member'; + $head=member_prepare_head($member, $user); + $titre=$langs->trans("Member"); + $picto='user'; dol_fiche_head($head, 'category', $titre,0,$picto); print '
| '.$langs->trans("Ref").' | '; - print $html->showrefnav($member,'ref','',1,'ref'); - print ' | '; - print '|
| '.$langs->trans("Label").' | '.$member->libelle.' | '; - print '|
| '.$langs->trans("Status").' | '; - print $member->getLibStatut(2); + // Ref + print ' | |
| '.$langs->trans("Ref").' | '; + print ''; + print $html->showrefnav($member,'rowid'); print ' | |
| '.$langs->trans("Lastname").' | '.$member->nom.' | '; + print '|
| '.$langs->trans("Firstname").' | '.$member->prenom.' | '; + print '|
| '.$langs->trans("Login").' | '.$member->login.' | |
| '.$langs->trans("Type").' | '.$adht->getNomUrl(1)." | |
| '.$langs->trans("Status").' | '.$member->getLibStatut(4).' | |