diff --git a/htdocs/fourn/pre.inc.php b/htdocs/fourn/pre.inc.php index 9c1510b3cc4..ee8f1ce0550 100644 --- a/htdocs/fourn/pre.inc.php +++ b/htdocs/fourn/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005 Laurent Destailleur + * Copyright (C) 2005-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 @@ -18,7 +18,6 @@ * * $Id$ * $Source$ - * */ /** @@ -89,7 +88,7 @@ function llxHeader($head = "", $title="", $addons='') { { if ($user->rights->produit->lire) { - $menu->add(DOL_URL_ROOT."/fourn/product/", $langs->trans("Products")); + $menu->add(DOL_URL_ROOT."/product/", $langs->trans("Products")); } } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index bf5f84cd8cb..b1dec1ba74d 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -65,14 +65,14 @@ if ($_POST["action"] == 'add' && $user->rights->produit->creer) { $product = new Product($db); - $product->ref = stripslashes($_POST["ref"]); - $product->libelle = stripslashes($_POST["libelle"]); - $product->price = stripslashes($_POST["price"]); + $product->ref = $_POST["ref"]; + $product->libelle = $_POST["libelle"]; + $product->price = $_POST["price"]; $product->tva_tx = $_POST["tva_tx"]; $product->type = $_POST["type"]; $product->status = $_POST["statut"]; - $product->description = stripslashes($_POST["desc"]); - $product->note = stripslashes($_POST["note"]); + $product->description = $_POST["desc"]; + $product->note = $_POST["note"]; $product->duration_value = $_POST["duration_value"]; $product->duration_unit = $_POST["duration_unit"]; $product->seuil_stock_alerte = $_POST["seuil_stock_alerte"]; @@ -88,9 +88,7 @@ if ($_POST["action"] == 'add' && $user->rights->produit->creer) } } - if ( $value != $current_lang ) - - $e_product = $product; + if ( $value != $current_lang ) $e_product = $product; $id = $product->create($user); @@ -101,12 +99,9 @@ if ($_POST["action"] == 'add' && $user->rights->produit->creer) } else { - if ($id == -3) - { - $_error = 1; - $_GET["action"] = "create"; - $_GET["type"] = $_POST["type"]; - } + $mesg='
'.$product->error.'
'; + $_GET["action"] = "create"; + $_GET["type"] = $_POST["type"]; } } @@ -118,13 +113,13 @@ if ($_POST["action"] == 'update' && $product = new Product($db); if ($product->fetch($_POST["id"])) { - $product->ref = stripslashes($_POST["ref"]); - $product->libelle = stripslashes($_POST["libelle"]); + $product->ref = $_POST["ref"]; + $product->libelle = $_POST["libelle"]; if ( isset( $_POST["price"] ) ) - $product->price = stripslashes($_POST["price"]); + $product->price = $_POST["price"]; $product->tva_tx = $_POST["tva_tx"]; - $product->description = stripslashes($_POST["desc"]); - $product->note = stripslashes($_POST["note"]); + $product->description = $_POST["desc"]; + $product->note = $_POST["note"]; $product->status = $_POST["statut"]; $product->seuil_stock_alerte = $_POST["seuil_stock_alerte"]; $product->duration_value = $_POST["duration_value"]; @@ -330,6 +325,9 @@ $html = new Form($db); if ($_GET["action"] == 'create' && $user->rights->produit->creer) { $product = new Product($db); + + if ($mesg) print "$mesg\n"; + if ($_error == 1) { $product = $e_product; diff --git a/htdocs/product/pre.inc.php b/htdocs/product/pre.inc.php index ea9ae7f9084..8975bcecccd 100644 --- a/htdocs/product/pre.inc.php +++ b/htdocs/product/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-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 @@ -18,14 +18,13 @@ * * $Id$ * $Source$ - * */ -/*! - \file htdocs/product/pre.inc.php - \ingroup product,service - \brief Fichier gestionnaire du menu gauche des produits et services - \version $Revision$ +/** + \file htdocs/product/pre.inc.php + \ingroup product,service + \brief Fichier gestionnaire du menu gauche des produits et services + \version $Revision$ */ require("../main.inc.php"); @@ -37,76 +36,71 @@ $user->getrights('facture'); function llxHeader($head = "", $urlp = "", $title="") { - global $user, $conf, $langs; - $langs->load("products"); - $user->getrights("produit"); - - top_menu($head, $title); - - $menu = new Menu(); - - if ($conf->produit->enabled) - { - $menu->add(DOL_URL_ROOT."/product/index.php?type=0", $langs->trans("Products")); - $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("List")); - - if ($user->societe_id == 0 && $user->rights->produit->creer) + global $user, $conf, $langs; + $langs->load("products"); + $user->getrights("produit"); + + top_menu($head, $title); + + $menu = new Menu(); + + if ($conf->produit->enabled) { - $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=0", $langs->trans("NewProduct")); + $menu->add(DOL_URL_ROOT."/product/index.php?type=0", $langs->trans("Products")); + $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("List")); + + if ($user->societe_id == 0 && $user->rights->produit->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=0", $langs->trans("NewProduct")); + } } - } - - if ($conf->service->enabled) - { - $menu->add(DOL_URL_ROOT."/product/index.php?type=1", $langs->trans("Services")); - $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=1", $langs->trans("List")); - if ($user->societe_id == 0 && $user->rights->produit->creer) + + if ($conf->service->enabled) { - $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=1", $langs->trans("NewService")); + $menu->add(DOL_URL_ROOT."/product/index.php?type=1", $langs->trans("Services")); + $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=1", $langs->trans("List")); + if ($user->societe_id == 0 && $user->rights->produit->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=1", $langs->trans("NewService")); + } } - } - - if ($conf->boutique->enabled) - { - $menu->add(DOL_URL_ROOT."/product/osc-liste.php", "Osc"); - $menu->add_submenu(DOL_URL_ROOT."/product/osc-liste.php?reqstock=epuise", "Produits Epuisés"); - - $menu->add(DOL_URL_ROOT."/product/osc-reviews.php", $langs->trans("Criticals")); - - $menu->add_submenu(DOL_URL_ROOT."/product/osc-productsbyreviews.php", "Meilleurs produits"); - - $menu->add(DOL_URL_ROOT."/product/album/", "Albums"); - $menu->add(DOL_URL_ROOT."/product/groupart/", "Groupes/Artistes"); - - $menu->add(DOL_URL_ROOT."/product/categorie/", $langs->trans("Categories")); - } - - if ($conf->fournisseur->enabled) { - $langs->load("suppliers"); - $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); - } - - $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); - if ($conf->propal->enabled) - { - $menu->add_submenu(DOL_URL_ROOT."/product/popuprop.php", $langs->trans("Popularity")); - } - - if ($conf->stock->enabled) - { - $menu->add(DOL_URL_ROOT."/product/stock/", $langs->trans("Stock")); - } - - if ($conf->categorie->enabled) - { - $menu->add(DOL_URL_ROOT."/categories/", $langs->trans("Categories")); - } - - left_menu($menu->liste); - /* - * - * - */ - + + if ($conf->boutique->enabled) + { + $menu->add(DOL_URL_ROOT."/product/osc-liste.php", "Osc"); + $menu->add_submenu(DOL_URL_ROOT."/product/osc-liste.php?reqstock=epuise", "Produits Epuisés"); + + $menu->add(DOL_URL_ROOT."/product/osc-reviews.php", $langs->trans("Criticals")); + + $menu->add_submenu(DOL_URL_ROOT."/product/osc-productsbyreviews.php", "Meilleurs produits"); + + $menu->add(DOL_URL_ROOT."/product/album/", "Albums"); + $menu->add(DOL_URL_ROOT."/product/groupart/", "Groupes/Artistes"); + + $menu->add(DOL_URL_ROOT."/product/categorie/", $langs->trans("Categories")); + } + + if ($conf->fournisseur->enabled) { + $langs->load("suppliers"); + $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); + } + + $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); + if ($conf->propal->enabled) + { + $menu->add_submenu(DOL_URL_ROOT."/product/popuprop.php", $langs->trans("Popularity")); + } + + if ($conf->stock->enabled) + { + $menu->add(DOL_URL_ROOT."/product/stock/", $langs->trans("Stock")); + } + + if ($conf->categorie->enabled) + { + $menu->add(DOL_URL_ROOT."/categories/", $langs->trans("Categories")); + } + + left_menu($menu->liste); } ?> diff --git a/htdocs/product/stats/pre.inc.php b/htdocs/product/stats/pre.inc.php index fd03790ebd2..73a682933cc 100644 --- a/htdocs/product/stats/pre.inc.php +++ b/htdocs/product/stats/pre.inc.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004 Laurent Destailleur + * Copyright (C) 2004-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 @@ -18,10 +18,9 @@ * * $Id$ * $Source$ - * */ - -/*! + +/** \file htdocs/product/stats/pre.inc.php \ingroup product,service \brief Fichier gestionnaire du menu gauche des statistiques de produits et services @@ -34,73 +33,73 @@ require(DOL_DOCUMENT_ROOT."/bargraph.class.php"); function llxHeader($head = "", $urlp = "", $title="") { - global $user, $conf, $langs; - $langs->load("products"); - $user->getrights("produit"); - - top_menu($head, $title); - - $menu = new Menu(); - - if ($conf->produit->enabled) - { - $menu->add(DOL_URL_ROOT."/product/index.php?type=0", $langs->trans("Products")); - $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("List")); - - if ($user->societe_id == 0 && $user->rights->produit->creer) - { - $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=0", $langs->trans("NewProduct")); - } - } + global $user, $conf, $langs; + $langs->load("products"); + $user->getrights("produit"); - if ($conf->service->enabled) - { - $menu->add(DOL_URL_ROOT."/product/index.php?type=1", $langs->trans("Services")); - $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=1", $langs->trans("List")); - if ($user->societe_id == 0 && $user->rights->produit->creer) + top_menu($head, $title); + + $menu = new Menu(); + + if ($conf->produit->enabled) { - $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=1", $langs->trans("NewService")); - } - } - - if ($conf->boutique->enabled) - { - - $menu->add(DOL_URL_ROOT."/product/osc-liste.php", "Osc"); - $menu->add_submenu(DOL_URL_ROOT."/product/osc-liste.php?reqstock=epuise", "Produits Epuisés"); - - - $menu->add(DOL_URL_ROOT."/product/osc-reviews.php", "Critiques"); - - $menu->add_submenu(DOL_URL_ROOT."/product/osc-productsbyreviews.php", "Meilleurs produits"); - - $menu->add(DOL_URL_ROOT."/product/album/", "Albums"); - $menu->add(DOL_URL_ROOT."/product/groupart/", "Groupes/Artistes"); - - $menu->add(DOL_URL_ROOT."/product/categorie/", $langs->trans("Categories")); - } - - if ($conf->fournisseur->enabled) { - $langs->load("suppliers"); - $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); - } - - $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); - if ($conf->propal->enabled) - { - $menu->add_submenu(DOL_URL_ROOT."/product/popuprop.php", $langs->trans("Popularity")); - } - - if ($conf->stock->enabled) - { - $menu->add(DOL_URL_ROOT."/product/stock/", $langs->trans("Stock")); - } - - left_menu($menu->liste); - /* - * - * - */ - + $menu->add(DOL_URL_ROOT."/product/index.php?type=0", $langs->trans("Products")); + $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=0", $langs->trans("List")); + + if ($user->societe_id == 0 && $user->rights->produit->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=0", $langs->trans("NewProduct")); + } + } + + if ($conf->service->enabled) + { + $menu->add(DOL_URL_ROOT."/product/index.php?type=1", $langs->trans("Services")); + $menu->add_submenu(DOL_URL_ROOT."/product/liste.php?type=1", $langs->trans("List")); + if ($user->societe_id == 0 && $user->rights->produit->creer) + { + $menu->add_submenu(DOL_URL_ROOT."/product/fiche.php?action=create&type=1", $langs->trans("NewService")); + } + } + + if ($conf->boutique->enabled) + { + + $menu->add(DOL_URL_ROOT."/product/osc-liste.php", "Osc"); + $menu->add_submenu(DOL_URL_ROOT."/product/osc-liste.php?reqstock=epuise", "Produits Epuisés"); + + + $menu->add(DOL_URL_ROOT."/product/osc-reviews.php", "Critiques"); + + $menu->add_submenu(DOL_URL_ROOT."/product/osc-productsbyreviews.php", "Meilleurs produits"); + + $menu->add(DOL_URL_ROOT."/product/album/", "Albums"); + $menu->add(DOL_URL_ROOT."/product/groupart/", "Groupes/Artistes"); + + $menu->add(DOL_URL_ROOT."/product/categorie/", $langs->trans("Categories")); + } + + if ($conf->fournisseur->enabled) { + $langs->load("suppliers"); + $menu->add(DOL_URL_ROOT."/fourn/index.php", $langs->trans("Suppliers")); + } + + $menu->add(DOL_URL_ROOT."/product/stats/", $langs->trans("Statistics")); + if ($conf->propal->enabled) + { + $menu->add_submenu(DOL_URL_ROOT."/product/popuprop.php", $langs->trans("Popularity")); + } + + if ($conf->stock->enabled) + { + $menu->add(DOL_URL_ROOT."/product/stock/", $langs->trans("Stock")); + } + + if ($conf->categorie->enabled) + { + $menu->add(DOL_URL_ROOT."/categories/", $langs->trans("Categories")); + } + + left_menu($menu->liste); } ?>