From bf0db736ac40659e0cd57287418a84c7a3d63f0f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 30 Jul 2006 13:01:31 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20pas=20de=20droits=20en=20modif=20su?= =?UTF-8?q?r=20produits,=20alors=20pas=20moyen=20de=20supprimer=20une=20af?= =?UTF-8?q?fectation=20de=20cat=E9gorie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/product/categorie.php | 387 ++++++++++++++++++----------------- 1 file changed, 200 insertions(+), 187 deletions(-) diff --git a/htdocs/product/categorie.php b/htdocs/product/categorie.php index 4cbb2df13cf..9dd9d3ccc4d 100644 --- a/htdocs/product/categorie.php +++ b/htdocs/product/categorie.php @@ -62,214 +62,227 @@ $html = new Form($db); if ($_GET["id"] || $_GET["ref"]) { //on veut supprimer une catégorie - if ($_REQUEST["cat"]) + if ($_REQUEST["removecat"] && $user->rights->produit->creer) { - $cat = new Categorie($db,$_REQUEST["cat"]); + $cat = new Categorie($db,$_REQUEST["removecat"]); $cat->del_product($product); } - + //on veut ajouter une catégorie - if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0) + if (isset($_REQUEST["catMere"]) && $_REQUEST["catMere"]>=0 && $user->rights->produit->creer) { $cat = new Categorie($db,$_REQUEST["catMere"]); $cat->add_product($product); } - - if ( $result ) + + /* + * En mode visu + */ + + $h=0; + + $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans("Card"); + $h++; + + $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id; + $head[$h][1] = $langs->trans("Price"); + $h++; + + //affichage onglet catégorie + if ($conf->categorie->enabled) { - - /* - * En mode visu - */ - - $h=0; - - $head[$h][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; - $head[$h][1] = $langs->trans("Card"); + $head[$h][0] = DOL_URL_ROOT."/product/categorie.php?id=".$product->id; + $head[$h][1] = $langs->trans('Categories'); + $hselected = $h; $h++; - - $head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$product->id; - $head[$h][1] = $langs->trans("Price"); - $h++; - - //affichage onglet catégorie - if ($conf->categorie->enabled) + } + + if($product->type == 0) + { + if ($user->rights->barcode->lire) { - $head[$h][0] = DOL_URL_ROOT."/product/categorie.php?id=".$product->id; - $head[$h][1] = $langs->trans('Categories'); - $hselected = $h; - $h++; - } - - if($product->type == 0) - { - if ($user->rights->barcode->lire) + if ($conf->barcode->enabled) { - if ($conf->barcode->enabled) - { - $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id; - $head[$h][1] = $langs->trans("BarCode"); - $h++; - } - } - } - - $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; - $head[$h][1] = $langs->trans("Photos"); - $h++; - - if($product->type == 0) - { - if ($conf->stock->enabled) - { - $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id; - $head[$h][1] = $langs->trans("Stock"); + $head[$h][0] = DOL_URL_ROOT."/product/barcode.php?id=".$product->id; + $head[$h][1] = $langs->trans("BarCode"); $h++; } } - - // Multilangs - if($conf->global->MAIN_MULTILANGS) - { + } + + $head[$h][0] = DOL_URL_ROOT."/product/photos.php?id=".$product->id; + $head[$h][1] = $langs->trans("Photos"); + $h++; + + if($product->type == 0) + { + if ($conf->stock->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$product->id; + $head[$h][1] = $langs->trans("Stock"); + $h++; + } + } + + // Multilangs + if($conf->global->MAIN_MULTILANGS) + { $head[$h][0] = DOL_URL_ROOT."/product/traduction.php?id=".$product->id; $head[$h][1] = $langs->trans("Translation"); $h++; - } - - if ($conf->fournisseur->enabled) - { - $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; - $head[$h][1] = $langs->trans("Suppliers"); - $h++; - } - - $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; - $head[$h][1] = $langs->trans('Statistics'); + } + + if ($conf->fournisseur->enabled) + { + $head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$product->id; + $head[$h][1] = $langs->trans("Suppliers"); $h++; - - // sousproduits - if($conf->global->PRODUIT_SOUSPRODUITS == 1) - { - $head[$h][0] = DOL_URL_ROOT."/product/sousproduits/fiche.php?id=".$product->id; - $head[$h][1] = $langs->trans('AssociatedProducts'); - $h++; - } - - $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; - $head[$h][1] = $langs->trans('Referers'); - $h++; - - $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; - $head[$h][1] = $langs->trans('Documents'); - $h++; - - $titre=$langs->trans("CardProduct".$product->type); - dolibarr_fiche_head($head, $hselected, $titre); - - print($mesg); - print ''; - print ""; - // Reference - print ''; - print ''; - - // Libelle - print ''; - print ''; - - // Prix - print ''; - - // Statut - print ''; - - print '
'.$langs->trans("Ref").''; - $product->load_previous_next_ref(); - $previous_ref = $product->ref_previous?''.img_previous().'':''; - $next_ref = $product->ref_next?''.img_next().'':''; - if ($previous_ref || $next_ref) print '
'; - print ''.$product->ref.''; - if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; - print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; - print $product->getLibStatut(2); - print '
'; - - print ''; - - - /* - * Barre d'actions - * - */ - print '
'; - if ($user->rights->categorie->creer) - { - print ''.$langs->trans("NewCat").''; - } - print '
'; - - - // Formulaire ajout dans une categorie - if ($user->rights->produit->creer) - { - print '
'; - print '
'; - print ''; - print ''; - print ''; - print '
'; - print $langs->trans("ClassifyInCategory").' '; - print $html->select_all_categories($categorie->id_mere).'
'; - print '
'; - print '
'; - } - - - $c = new Categorie($db); - - if ($_GET["id"]) - { - $cats = $c->containing($_REQUEST["id"]); - } - - if ($_GET["ref"]) - { - $cats = $c->containing_ref($_REQUEST["ref"]); - } - - if (sizeof($cats) > 0) - { - print_fiche_titre($langs->trans("ProductIsInCategories")); - print ''; - print ''; - - $var = true; - foreach ($cats as $cat) - { - $ways = $cat->print_all_ways (); - foreach ($ways as $way) - { - $var = ! $var; - print ""; - print '\n"; - - } - - } - print "
'.$langs->trans("Categories").'
".$way."'.img_delete($langs->trans("DeleteFromCat"))." ".$langs->trans("DeleteFromCat")."

\n"; - } - else if($cats < 0) - { - print $langs->trans("ErrorUnknown"); - } - - else - { - print $langs->trans("ProductHasNoCategory")."
"; - } - } + $head[$h][0] = DOL_URL_ROOT."/product/stats/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans('Statistics'); + $h++; + + // sousproduits + if($conf->global->PRODUIT_SOUSPRODUITS == 1) + { + $head[$h][0] = DOL_URL_ROOT."/product/sousproduits/fiche.php?id=".$product->id; + $head[$h][1] = $langs->trans('AssociatedProducts'); + $h++; + } + + $head[$h][0] = DOL_URL_ROOT."/product/stats/facture.php?id=".$product->id; + $head[$h][1] = $langs->trans('Referers'); + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$product->id; + $head[$h][1] = $langs->trans('Documents'); + $h++; + + $titre=$langs->trans("CardProduct".$product->type); + dolibarr_fiche_head($head, $hselected, $titre); + + print($mesg); + print ''; + print ""; + // Reference + print ''; + print ''; + + // Libelle + print ''; + print ''; + + // Prix + print ''; + + // Statut + print ''; + + print '
'.$langs->trans("Ref").''; + $product->load_previous_next_ref(); + $previous_ref = $product->ref_previous?''.img_previous().'':''; + $next_ref = $product->ref_next?''.img_next().'':''; + if ($previous_ref || $next_ref) print '
'; + print ''.$product->ref.''; + if ($previous_ref || $next_ref) print ''.$previous_ref.''.$next_ref.'
'; + print '
'.$langs->trans("Label").''.$product->libelle.'
'.$langs->trans("SellingPrice").''.price($product->price).'
'.$langs->trans("Status").''; + print $product->getLibStatut(2); + print '
'; + + print ''; + + + /* + * Barre d'actions + * + */ + print '
'; + if ($user->rights->categorie->creer) + { + print ''.$langs->trans("NewCat").''; + } + print '
'; + + + // Formulaire ajout dans une categorie + if ($user->rights->produit->creer) + { + print '
'; + print '
'; + print ''; + print ''; + print ''; + print '
'; + print $langs->trans("ClassifyInCategory").' '; + print $html->select_all_categories($categorie->id_mere).'
'; + print '
'; + print '
'; + } + + + $c = new Categorie($db); + + if ($_GET["id"]) + { + $cats = $c->containing($_REQUEST["id"]); + } + + if ($_GET["ref"]) + { + $cats = $c->containing_ref($_REQUEST["ref"]); + } + + if (sizeof($cats) > 0) + { + print_fiche_titre($langs->trans("ProductIsInCategories")); + print ''; + print ''; + + $var = true; + foreach ($cats as $cat) + { + $ways = $cat->print_all_ways (); + foreach ($ways as $way) + { + $var = ! $var; + print ""; + + // Categorie + print ""; + + // Lien supprimer + print '"; + + print "\n"; + + } + + } + print "
'.$langs->trans("Categories").'
".$way."'; + if ($user->rights->produit->creer) + { + print ""; + print img_delete($langs->trans("DeleteFromCat")).' '; + print $langs->trans("DeleteFromCat").""; + } + else + { + print ' '; + } + print "

\n"; + } + else if($cats < 0) + { + print $langs->trans("ErrorUnknown"); + } + + else + { + print $langs->trans("ProductHasNoCategory")."
"; + } + } $db->close();