diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 8046b99c1200be5f60cbe292d90e2572b7d51fe2..226b0a88ca0c8f2ec71b2ba761657632bc8c46d8 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -307,20 +307,26 @@ else if ($_GET["id"] || $_GET["ref"])
print '<table class="border" width="100%">';
+
+ // Ref
print "<tr>";
- // Reference
print '<td width="15%">'.$langs->trans("Ref").'</td><td>';
print $html->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
- // Libelle
+ // Label
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
print '</table>';
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index 064fe8a9d73ecf8e6d89c1aa3b48f25c5751f521..cdb297d3f76a08a2fae6ba9c7d429c62a8781993 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -110,10 +110,15 @@ print '</td>';
print '</tr>'."\n";
-// Statut
-print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
-print $product->getLibStatut(2);
-print '</td></tr>'."\n";
+// Status (to sell)
+print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+print $product->getLibStatut(2,0);
+print '</td></tr>';
+
+// Status (to buy)
+print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+print $product->getLibStatut(2,1);
+print '</td></tr>';
// Barcode type
print '<tr><td nowrap>';
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 28ac240e83de7fe93c47337e3977250c07cf6597..223a9f03969c0e89625b77c3344835aa91cb2abf 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -145,20 +145,25 @@ if ($product->id)
print '<table class="border" width="100%">';
- // Reference
+ // Ref
print '<tr>';
print '<td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">';
print $html->showrefnav($product,'ref','',1,'ref');
print '</td>';
print '</tr>';
- // Libelle
+ // Label
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td></tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
- print $product->getLibStatut(2);
- print '</td></tr>';
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
+ print '</td></tr>';
print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.sizeof($filearray).'</td></tr>';
print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index e8398684d78b525d7be717d6f2094521eedab783..c6537abe878f5aa02f606c95131dbf7f699c09cd 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -25,7 +25,7 @@
/**
* \file htdocs/product/fiche.php
* \ingroup product
- * \brief Page de la fiche produit
+ * \brief Page to show product
* \version $Id$
*/
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index c07d34626030bf3ae96dbf04ddc90b3e0c6c9b7f..e522f46e4c2cac69a562aba7e6d3615369aacd8b 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -226,8 +226,8 @@ if ($_GET["id"] || $_GET["ref"])
// Libelle
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td></tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
print $product->getLibStatut(2,1);
print '</td></tr>';
diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php
index 4e82ef8f1925fc7dcbbec22054478429c7574b14..364c5ef19ec051f2834f1528fd80dc2b2da3a1db 100644
--- a/htdocs/product/photos.php
+++ b/htdocs/product/photos.php
@@ -124,9 +124,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="2">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
print "</table>\n";
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 846e4eeecccb44c492696fcb572492bcdb0da4c0..59a42787d04ecb66c005b97b08b4e032ddebda80 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -267,9 +267,9 @@ else
print '</td></tr>';
}
-// Statut
-print '<tr><td>'.$langs->trans("Status").'</td><td>';
-print $product->getLibStatut(2);
+// Status (to sell)
+print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+print $product->getLibStatut(2,0);
print '</td></tr>';
print "</table>\n";
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 05f03cd398f48b6baa66b7eb8cc43fad74ff824f..7df7597598e208b31525c775defebf28e9396776 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -98,9 +98,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 5720d45f891a53bb25ea452b81a434bd6dcf6849..98da716d6d036f24c3ea6af228cbc71d4ba1f499 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -93,9 +93,14 @@ if ($_GET["id"] || $_GET["ref"])
// Libelle
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td></tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index cc2bf0ec89ea88d5d32bb06a603902da7d386def..e83fca7081711d86772456e63bba347f669bf2e6 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -98,9 +98,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 3c758e5a8f77fdbff453d403bb8f0f11bb08f18f..0fe1f25f899c4245d4395997e808add37ba1ae16 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -100,9 +100,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 1441cd5b44e02ffc6f2d189f505f1b67e754464f..570e1024066e5ed7d691e8d087e0f10d93fc4219 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -101,10 +101,15 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
- print '</td></tr>';
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
+ print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stats/fiche.php b/htdocs/product/stats/fiche.php
index 857253020ee1d2576bdbeac62a45c52f8efc644f..777964702722af7070cbf0f682f9394f40462e28 100644
--- a/htdocs/product/stats/fiche.php
+++ b/htdocs/product/stats/fiche.php
@@ -80,12 +80,17 @@ if ($_GET["id"] || $_GET["ref"])
print '</td>';
print '</tr>';
- // Libelle
+ // Label
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td></tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index c88bba5e69342e679b0953d22ebef957066d52a5..ac11a4f83cfc200af08b2cf0c3ca49e6e439ca69 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -95,9 +95,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td colspan="3">'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td colspan="3">';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
show_stats_for_company($product,$socid);
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index cb67141af9c689ca728a69453d6612d77dc5368f..6edd7d7e4b9bab6d852e9822389f1065b9a6a763 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -170,9 +170,14 @@ if ($_GET["id"] || $_GET["ref"])
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$product->libelle.'</td>';
print '</tr>';
- // Statut
- print '<tr><td>'.$langs->trans("Status").'</td><td>';
- print $product->getLibStatut(2);
+ // Status (to sell)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Sell").')'.'</td><td>';
+ print $product->getLibStatut(2,0);
+ print '</td></tr>';
+
+ // Status (to buy)
+ print '<tr><td>'.$langs->trans("Status").' ('.$langs->trans("Buy").')'.'</td><td>';
+ print $product->getLibStatut(2,1);
print '</td></tr>';
// Stock physique