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

Fix: category problem

Browse Source
This commit is contained in:
Regis Houssin 2010-04-15 17:34:44 +00:00
parent 62b0105a18
commit e2d2461d1f
5 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
htdocs/categories/categorie.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005 Brice Davoleau <brice.davoleau@gmail.com> * Copyright (C) 2005 Brice Davoleau <brice.davoleau@gmail.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* *
@ -41,36 +41,36 @@ $dbtablename = '';
if (! empty($_REQUEST["socid"])) { if (! empty($_REQUEST["socid"])) {
$_REQUEST["id"]=$_REQUEST["socid"]; $_REQUEST["id"]=$_REQUEST["socid"];
} }
if (! isset($_REQUEST["typeid"])) $_REQUEST["typeid"]=0; if (! isset($_REQUEST["type"])) $_REQUEST["type"]=0;
if ($_REQUEST["typeid"] == 1) $_GET["socid"]=$_REQUEST["id"]; if ($_REQUEST["type"] == 1) $_GET["socid"]=$_REQUEST["id"];
if ($_REQUEST["typeid"] == 2) $_GET["socid"]=$_REQUEST["id"]; if ($_REQUEST["type"] == 2) $_GET["socid"]=$_REQUEST["id"];
if ($_REQUEST["id"] || $_REQUEST["ref"]) if ($_REQUEST["id"] || $_REQUEST["ref"])
{ {
if ($_REQUEST["typeid"] == 0) { if ($_REQUEST["type"] == 0) {
$type = 'member'; $type = 'product';
$objecttype = 'adherent&categorie'; $objecttype = 'produit|service&categorie';
$objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:''); $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:'');
$dbtablename = 'adherent'; $dbtablename = 'product';
$fieldid = isset($_REQUEST["ref"])?'ref':'rowid'; $fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
} }
if ($_REQUEST["typeid"] == 1) { if ($_REQUEST["type"] == 1) {
$type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; $type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
$objecttype = 'societe&categorie'; $objecttype = 'societe&categorie';
$objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["socid"])?$_REQUEST["socid"]:''); $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["socid"])?$_REQUEST["socid"]:'');
$fieldid = 'rowid'; $fieldid = 'rowid';
} }
if ($_REQUEST["typeid"] == 2) { if ($_REQUEST["type"] == 2) {
$type = 'societe'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; $type = 'societe'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
$objecttype = 'societe&categorie'; $objecttype = 'societe&categorie';
$objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["socid"])?$_REQUEST["socid"]:''); $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["socid"])?$_REQUEST["socid"]:'');
$fieldid = 'rowid'; $fieldid = 'rowid';
} }
if ($_REQUEST["typeid"] == 3) { if ($_REQUEST["type"] == 3) {
$type = 'member'; $type = 'member';
$objecttype = 'produit|service&categorie'; $objecttype = 'adherent&categorie';
$objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:''); $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:'');
$dbtablename = 'product'; $dbtablename = 'adherent';
$fieldid = isset($_REQUEST["ref"])?'ref':'rowid'; $fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
} }
} }
@ -87,7 +87,7 @@ $result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid
//Suppression d'un objet d'une categorie //Suppression d'un objet d'une categorie
if ($_REQUEST["removecat"]) if ($_REQUEST["removecat"])
{ {
if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) if ($_REQUEST["type"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
$object = new Product($db); $object = new Product($db);
@ -95,17 +95,17 @@ if ($_REQUEST["removecat"])
if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]); if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]);
$type = 'product'; $type = 'product';
} }
if ($_REQUEST["typeid"]==1 && $user->rights->societe->creer) if ($_REQUEST["type"]==1 && $user->rights->societe->creer)
{ {
$object = new Societe($db); $object = new Societe($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
} }
if ($_REQUEST["typeid"]==2 && $user->rights->societe->creer) if ($_REQUEST["type"]==2 && $user->rights->societe->creer)
{ {
$object = new Societe($db); $object = new Societe($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
} }
if ($_REQUEST["typeid"] == 3 && $user->rights->adherent->creer) if ($_REQUEST["type"] == 3 && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
$object = new Adherent($db); $object = new Adherent($db);
@ -123,7 +123,7 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
$_GET["id"]=$_REQUEST["id"]; $_GET["id"]=$_REQUEST["id"];
$_GET["type"]=$_REQUEST["type"]; $_GET["type"]=$_REQUEST["type"];
if ($_REQUEST["typeid"]==0 && ($user->rights->produit->creer || $user->rights->service->creer)) if ($_REQUEST["type"]==0 && ($user->rights->produit->creer || $user->rights->service->creer))
{ {
require_once(DOL_DOCUMENT_ROOT."/product/product.class.php"); require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
$object = new Product($db); $object = new Product($db);
@ -131,19 +131,19 @@ if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0)
if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]); if ($_REQUEST["id"]) $result = $object->fetch($_REQUEST["id"]);
$type = 'product'; $type = 'product';
} }
if ($_REQUEST["typeid"]==1 && $user->rights->societe->creer) if ($_REQUEST["type"]==1 && $user->rights->societe->creer)
{ {
$object = new Societe($db); $object = new Societe($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
$type = 'fournisseur'; $type = 'fournisseur';
} }
if ($_REQUEST["typeid"]==2 && $user->rights->societe->creer) if ($_REQUEST["type"]==2 && $user->rights->societe->creer)
{ {
$object = new Societe($db); $object = new Societe($db);
$result = $object->fetch($objectid); $result = $object->fetch($objectid);
$type = 'societe'; $type = 'societe';
} }
if ($_REQUEST["typeid"]==3 && $user->rights->adherent->creer) if ($_REQUEST["type"]==3 && $user->rights->adherent->creer)
{ {
require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
$object = new Adherent($db); $object = new Adherent($db);

2
htdocs/categories/fiche.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org> /* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
* Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2006-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2008 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

13
htdocs/install/mysql/migration/2.8.0-2.9.0.sql
View File

@ -200,3 +200,16 @@ ALTER TABLE llx_deplacement ADD COLUMN fk_statut INTEGER DEFAULT 1 NOT NULL aft
drop table llx_appro; drop table llx_appro;
ALTER TABLE llx_events MODIFY COLUMN user_agent varchar(255) NULL; ALTER TABLE llx_events MODIFY COLUMN user_agent varchar(255) NULL;
create table llx_categorie_member
(
fk_categorie integer NOT NULL,
fk_member integer NOT NULL
)type=innodb;
ALTER TABLE llx_categorie_member ADD PRIMARY KEY (fk_categorie, fk_member);
ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_categorie (fk_categorie);
ALTER TABLE llx_categorie_member ADD INDEX idx_categorie_member_fk_member (fk_member);
ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
ALTER TABLE llx_categorie_member ADD CONSTRAINT fk_categorie_member_member_rowid FOREIGN KEY (fk_member) REFERENCES llx_adherent (rowid);

4
htdocs/lib/company.lib.php
View File

@ -83,7 +83,9 @@ function societe_prepare_head($objsoc)
//show categorie tab //show categorie tab
if ($conf->categorie->enabled) if ($conf->categorie->enabled)
{ {
$head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?socid='.$objsoc->id; $type = 2;
if ($objsoc->fournisseur) $type = 1;
$head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?socid='.$objsoc->id."&type=".$type;
$head[$h][1] = $langs->trans('Categories'); $head[$h][1] = $langs->trans('Categories');
$head[$h][2] = 'category'; $head[$h][2] = 'category';
$h++; $h++;

2
htdocs/lib/product.lib.php
View File

@ -62,7 +62,7 @@ function product_prepare_head($product, $user)
// Show category tab // Show category tab
if ($conf->categorie->enabled && $user->rights->categorie->lire) if ($conf->categorie->enabled && $user->rights->categorie->lire)
{ {
$head[$h][0] = DOL_URL_ROOT."/categories/categorie.php?id=".$product->id."&typeid=3"; $head[$h][0] = DOL_URL_ROOT."/categories/categorie.php?id=".$product->id.'&type=0';
$head[$h][1] = $langs->trans('Categories'); $head[$h][1] = $langs->trans('Categories');
$head[$h][2] = 'category'; $head[$h][2] = 'category';
$h++; $h++;