From b11c6f3a3b86242bbae32fbd7d7fcabe2200cb88 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Mar 2006 20:32:55 +0000 Subject: [PATCH] =?UTF-8?q?Look:=20Modif=20esth=E9tiques=20mineures=20sur?= =?UTF-8?q?=20page=20des=20cat=E9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/langs/en_US/categories.lang | 3 +- htdocs/langs/fr_FR/categories.lang | 1 + htdocs/product/categorie.php | 354 +++++++++++++++-------------- 3 files changed, 183 insertions(+), 175 deletions(-) diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 4483fe4f012..efd6b122df8 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -31,4 +31,5 @@ ErrCatAlreadyExists=This name is already used AddProductToCat=Add this product to a category? ImpossibleAddCat=Impossible to add the category ImpossibleAssociateCategory=Impossible to associate the category to -WasAddedSuccessfully=was added successfully. \ No newline at end of file +WasAddedSuccessfully=was added successfully. +ProductIsInCategories=Product/Service is in following categories \ No newline at end of file diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 7982f080931..f9f654e626b 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -32,3 +32,4 @@ AddProductToCat=Ajouter ce produit ImpossibleAddCat=Impossible d'ajouter la catégorie ImpossibleAssociateCategory=Impossible d'associer la catégorie à WasAddedSuccessfully=a été ajoutée avec succès. +ProductIsInCategories=Ce produit/service est dans les catégorie suivantes diff --git a/htdocs/product/categorie.php b/htdocs/product/categorie.php index eb4f9edffe3..a1848fe14e4 100644 --- a/htdocs/product/categorie.php +++ b/htdocs/product/categorie.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2005 Rodolphe Quiedeville * Copyright (C) 2005 Brice Davoleau * Copyright (C) 2005-2006 Regis Houssin + * Copyright (C) 2006 Laurent Destailleur * * 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 @@ -22,10 +23,10 @@ */ /** - \file htdocs/product/categorie.php - \ingroup product - \brief Page de l'onglet categories de produits - \version $Revision$ + \file htdocs/product/categorie.php + \ingroup product + \brief Page de l'onglet categories de produits + \version $Revision$ */ require("./pre.inc.php"); @@ -42,15 +43,17 @@ $types[0] = $langs->trans("Product"); $types[1] = $langs->trans("Service"); /* - * Creation de l'objet produit correspondant à l'id - */ +* Creation de l'objet produit correspondant à l'id +*/ if ($_GET["id"] || $_GET["ref"]) -{ - $product = new Product($db); - if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); - if ($_GET["id"]) $result = $product->fetch($_GET["id"]); +{ + $product = new Product($db); + if ($_GET["ref"]) $result = $product->fetch('',$_GET["ref"]); + if ($_GET["id"]) $result = $product->fetch($_GET["id"]); } + + llxHeader("","",$langs->trans("CardProduct0")); /* @@ -58,177 +61,180 @@ llxHeader("","",$langs->trans("CardProduct0")); */ if ($_GET["id"] || $_GET["ref"]) { - //on veut supprimer une catégorie - if ($_REQUEST["cat"]) - { - $cat = new Categorie($db,$_REQUEST["cat"]); - $cat->del_product($product); - } - - //on veut ajouter une catégorie - if (isset($_REQUEST["add_cat"]) && $_REQUEST["add_cat"]>=0) - { - $cat = new Categorie($db,$_REQUEST["add_cat"]); - $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) - { - $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) - { - $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"); - $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'); - $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 ''; - - $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) + //on veut supprimer une catégorie + if ($_REQUEST["cat"]) { - print "Vous avez stocké le produit dans les catégorie suivantes:

"; - 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.'
'; - print ''; - - - foreach ($cats as $cat) - { - - $ways = $cat->print_all_ways (); - foreach ($ways as $way) + $cat = new Categorie($db,$_REQUEST["cat"]); + $cat->del_product($product); + } + + //on veut ajouter une catégorie + if (isset($_REQUEST["add_cat"]) && $_REQUEST["add_cat"]>=0) + { + $cat = new Categorie($db,$_REQUEST["add_cat"]); + $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) { - $i = !$i; - print ""; - print "\n"; - + $head[$h][0] = DOL_URL_ROOT."/product/categorie.php?id=".$product->id; + $head[$h][1] = $langs->trans('Categories'); + $hselected = $h; + $h++; } - - } - print "
'.$langs->trans("AllWays").'
".$way."".$langs->trans("DeleteFromCat")."


\n"; - } - else if($cats < 0) - { - print $langs->trans("ErrorUnknown"); + + if($product->type == 0) + { + if ($user->rights->barcode->lire) + { + 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"); + $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'); + $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 ''; + 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.'

'; + + // Formulaire ajout dans une categorie + print $langs->trans("AddProductToCat")."
"; + print ''; + print ''; + print ''; + print '
'; + 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 $langs->trans("ProductIsInCategories"); + print '
'; + print ''; + print ''; + + foreach ($cats as $cat) + { + + $ways = $cat->print_all_ways (); + foreach ($ways as $way) + { + $i = !$i; + print ""; + print "\n"; + + } + + } + print "
'.$langs->trans("AllWays").'
".$way."".$langs->trans("DeleteFromCat")."

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

"; - } - - } - - print $langs->trans("AddProductToCat")."

"; - print ''; - print ''; - print ''; - print '
'; - print ''; - print '

'; - + } $db->close(); -llxFooter("Dernière modification $Date$ révision $Revision$"); +llxFooter('$Date$ - $Revision$'); ?>