diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index d291babb4f8..4dddca1dcc0 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -34,17 +34,12 @@ $langs->load("products");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index de675bdf9c7..6584044a22b 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -39,17 +39,12 @@ $langs->load("products");
 $action=empty($_GET['action']) ? (empty($_POST['action']) ? '' : $_POST['action']) : $_GET['action'];
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index 8ccb413b57e..b152d97c149 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -41,17 +41,12 @@ $langs->load("other");
 $langs->load("stocks");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 916c50f1756..097d7c5b689 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -36,17 +36,12 @@ $langs->load("suppliers");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 6617cc9a0d1..06ac4f8e4da 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -35,17 +35,12 @@ $langs->load("products");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 1d92088d557..3e78dd81d62 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -35,17 +35,12 @@ $langs->load("products");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/sousproduits/fiche.php b/htdocs/product/sousproduits/fiche.php
index 9c5813b77b7..90c61151ea7 100644
--- a/htdocs/product/sousproduits/fiche.php
+++ b/htdocs/product/sousproduits/fiche.php
@@ -36,17 +36,12 @@ $langs->load("bills");
 $langs->load("products");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 2d366a73990..006f09bde86 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -36,17 +36,12 @@ $langs->load("products");
 $langs->load("companies");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 6383e78ab8d..709ce3b3dda 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -36,17 +36,12 @@ $langs->load("products");
 $langs->load("companies");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 75f8ac14911..e98d6759054 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -35,17 +35,12 @@ $langs->load("products");
 $langs->load("companies");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 942aff4c3a8..0d2f7e688d0 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -36,17 +36,12 @@ $langs->load("bills");
 $langs->load("products");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index bcb627a5efd..658daa9dd28 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -37,17 +37,12 @@ $langs->load("products");
 $langs->load("companies");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 01c2864ebec..65e27845c91 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -39,17 +39,12 @@ $langs->load("other");
 $mode=isset($_GET["mode"])?$_GET["mode"]:'byunit';
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 42d1b0e8210..f3e4aed3f80 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -35,17 +35,12 @@ $langs->load("products");
 $langs->load("companies");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 56564483aab..158f140447c 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -37,17 +37,12 @@ $langs->load("orders");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);
 
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index d3a33a96f65..f619b0a8ac9 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -36,17 +36,12 @@ $langs->load("products");
 $langs->load("bills");
 
 // Security check
-$id = '';
-if (isset($_GET["id"]))
+if (isset($_GET["id"]) || isset($_GET["ref"]))
 {
-	$id = $_GET["id"];
-	$fieldid = 'rowid';
-}
-if (isset($_GET["ref"]))
-{
-	$id = $_GET["ref"];
-	$fieldid = 'ref';
+	$id = isset($_GET["id"])?$_GET["id"]:(isset($_GET["ref"])?$_GET["ref"]:'');
+	$fieldid = isset($_REQUEST["ref"])?'ref':'rowid';
 }
+
 if ($user->societe_id) $socid=$user->societe_id;
 $result=restrictedArea($user,'produit',$id,'product','','',$fieldid);