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

Fix: just one & its ok :)

Browse Source
This commit is contained in:
Regis Houssin 2009-10-16 13:15:26 +00:00
parent 2d6444fb68
commit 2303de3162
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/categories/categorie.php
View File

@ -39,14 +39,14 @@ if ($_REQUEST["socid"])
{ {
if ($_REQUEST["typeid"] == 1) { $type = 'fournisseur'; $socid = isset($_REQUEST["socid"])?$_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"]:''; } if ($_REQUEST["typeid"] == 2) { $type = 'societe'; $socid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; }
$objecttype = 'societe&&categorie'; $objecttype = 'societe&categorie';
$objectid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:''; $objectid = isset($_REQUEST["socid"])?$_REQUEST["socid"]:'';
$fieldid = 'rowid'; $fieldid = 'rowid';
} }
else if ($_REQUEST["id"] || $_REQUEST["ref"]) else if ($_REQUEST["id"] || $_REQUEST["ref"])
{ {
$type = 'produit'; $type = 'produit';
$objecttype = 'produit|service&&categorie'; $objecttype = 'produit|service&categorie';
$objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:''); $objectid = isset($_REQUEST["id"])?$_REQUEST["id"]:(isset($_REQUEST["ref"])?$_REQUEST["ref"]:'');
$dbtablename = 'product'; $dbtablename = 'product';
$fieldid = isset($_REQUEST["ref"])?'ref':'rowid'; $fieldid = isset($_REQUEST["ref"])?'ref':'rowid';

2
htdocs/lib/functions.lib.php
View File

@ -1518,7 +1518,7 @@ function restrictedArea($user, $features='societe', $objectid=0, $dbtablename=''
//print ", user_societe_contact_lire=".$user->rights->societe->contact->lire."<br>"; //print ", user_societe_contact_lire=".$user->rights->societe->contact->lire."<br>";
// More features to check // More features to check
$features = explode("&&",$features); $features = explode("&",$features);
// Check read permission from module // Check read permission from module
// TODO Replace "feature" param by permission for reading // TODO Replace "feature" param by permission for reading

2
htdocs/product/barcode.php
View File

@ -40,7 +40,7 @@ if (isset($_GET["id"]) || isset($_GET["ref"]))
} }
$fieldid = isset($_GET["ref"])?'ref':'rowid'; $fieldid = isset($_GET["ref"])?'ref':'rowid';
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit|service&&barcode',$id,'product','','',$fieldid); $result=restrictedArea($user,'produit|service&barcode',$id,'product','','',$fieldid);
/* /*
* Actions * Actions

2
htdocs/product/fournisseurs.php
View File

@ -50,7 +50,7 @@ if (isset($_GET["id"]) || isset($_GET["ref"]))
} }
$fieldid = isset($_GET["ref"])?'ref':'rowid'; $fieldid = isset($_GET["ref"])?'ref':'rowid';
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit|service&&fournisseur',$id,'product','','',$fieldid); $result=restrictedArea($user,'produit|service&fournisseur',$id,'product','','',$fieldid);
$mesg = ''; $mesg = '';

2
htdocs/product/stock/product.php
View File

@ -43,7 +43,7 @@ if (isset($_GET["id"]) || isset($_GET["ref"]))
} }
$fieldid = isset($_GET["ref"])?'ref':'rowid'; $fieldid = isset($_GET["ref"])?'ref':'rowid';
if ($user->societe_id) $socid=$user->societe_id; if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit&&stock',$id,'product','','',$fieldid); $result=restrictedArea($user,'produit&stock',$id,'product','','',$fieldid);
$mesg = ''; $mesg = '';