diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 2ddb61e39a3..52047d28bcf 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -39,17 +39,19 @@ if ($_REQUEST["socid"]) { if ($_REQUEST["typeid"] == 1) { $type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; } if ($_REQUEST["typeid"] == 2) { $type = 'societe'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; } + $objecttype = 'societe'; $objectid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; } else if ($_REQUEST["id"] || $_REQUEST["ref"]) { $type = 'produit'; + $objecttype = 'produit'; $dbtablename = 'product'; } // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, $type, $objectid, $dbtablename); +$result = restrictedArea($user, $objecttype, $objectid, $dbtablename); diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index eac69532029..d222bea55c2 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -76,7 +76,7 @@ function societe_prepare_head($objsoc) //show categorie tab if ($conf->categorie->enabled) { - $head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?type=2&socid='.$objsoc->id; + $head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?socid='.$objsoc->id; $head[$h][1] = $langs->trans('Categories'); $head[$h][2] = 'category'; $h++; diff --git a/htdocs/livraison/fiche.php b/htdocs/livraison/fiche.php index 194a316a5b8..91a5471f99e 100644 --- a/htdocs/livraison/fiche.php +++ b/htdocs/livraison/fiche.php @@ -255,9 +255,9 @@ if ($_GET["action"] == 'create') { print ''; print ''.$langs->trans("Description").''; - print 'Quan. command�e'; - print 'Quan. livr�e'; - print 'Quan. � livrer'; + print 'Quan. commandee'; + print 'Quan. livree'; + print 'Quan. a livrer'; if ($conf->stock->enabled) { print ''.$langs->trans("Stock").''; @@ -300,9 +300,9 @@ if ($_GET["action"] == 'create') if ($conf->stock->enabled) { $stock = $product->stock_entrepot[$_GET["entrepot_id"]]; - $stock+=0; // Convertit en num�rique + $stock+=0; // Convertit en numerique - // Quantit� � livrer + // Quantite a livrer print ''; print ''; print '';