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

Fix: suppression de la cle unique sur le champs label afin de pouvoir crer une catgorie de socit ayant le mme nom qu'une catgorie de produit par exemple

Browse Source
This commit is contained in:
Regis Houssin 2007-06-16 20:46:31 +00:00
parent 24e8092e4b
commit 95ab3a0919
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/categories/categorie.class.php
View File

@ -657,7 +657,7 @@ class Categorie
{
$sql = "SELECT count(c.rowid)";
$sql.= " FROM ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_association as ca";
$sql.= " WHERE c.label = '".addslashes($this -> label)."'";
$sql.= " WHERE c.label = '".addslashes($this -> label)."' AND type=".$this->type;
if($this -> id_mere != "")
{
$sql.= " AND c.rowid = ca.fk_categorie_fille";

2
htdocs/categories/viewcat.php
View File

@ -57,7 +57,7 @@ if ($user->rights->categorie->supprimer && $_POST["action"] == 'confirm_delete'
{
if ($c->remove() >= 0)
{
header("Location: ".DOL_URL_ROOT.'/categories/index.php?type=0');
header("Location: ".DOL_URL_ROOT.'/categories/index.php?type='.$type);
exit;
}
else

2
mysql/migration/2.1.0-2.2.0.sql
View File

@ -658,3 +658,5 @@ ALTER TABLE `llx_osc_product` ADD UNIQUE KEY `fk_product` (`fk_product`);
-- V4 ALTER TABLE llx_telephonie_societe_ligne ADD FOREIGN KEY (fk_soc_facture) REFERENCES llx_societe(rowid);
-- V4 ALTER TABLE llx_telephonie_tarif_client ADD FOREIGN KEY (fk_client) REFERENCES llx_societe (rowid);
-- fin du changement idp en rowid
-- V4 ALTER TABLE llx_categorie DROP INDEX uk_categorie_ref;

20
mysql/tables/llx_categorie.key.sql
View File

@ -1,20 +0,0 @@
-- ============================================================================
-- Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
-- the Free Software Foundation; either version 2 of the License, or
-- (at your option) any later version.
--
-- This program is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- GNU General Public License for more details.
--
-- You should have received a copy of the GNU General Public License
-- along with this program; if not, write to the Free Software
-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
-- ============================================================================
ALTER TABLE llx_categorie ADD UNIQUE INDEX uk_categorie_ref (label);