From fb918aa00155e7e267809606b1ed22719a9f71cf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 18 Dec 2010 17:51:15 +0000
Subject: [PATCH] Fix: New product status was not visible on all tabs.
---
htdocs/categories/categorie.php | 16 +++++++++++-----
htdocs/product/barcode.php | 13 +++++++++----
htdocs/product/document.php | 17 +++++++++++------
htdocs/product/fiche.php | 2 +-
htdocs/product/fournisseurs.php | 4 ++--
htdocs/product/photos.php | 11 ++++++++---
htdocs/product/price.php | 6 +++---
htdocs/product/stats/commande.php | 11 ++++++++---
htdocs/product/stats/commande_fournisseur.php | 11 ++++++++---
htdocs/product/stats/contrat.php | 11 ++++++++---
htdocs/product/stats/facture.php | 11 ++++++++---
htdocs/product/stats/facture_fournisseur.php | 13 +++++++++----
htdocs/product/stats/fiche.php | 13 +++++++++----
htdocs/product/stats/propal.php | 11 ++++++++---
htdocs/product/stock/product.php | 11 ++++++++---
15 files changed, 111 insertions(+), 50 deletions(-)
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 8046b99c120..226b0a88ca0 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 064fe8a9d73..cdb297d3f76 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 28ac240e83d..223a9f03969 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 e8398684d78..c6537abe878 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 c07d3462603..e522f46e4c2 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 4e82ef8f192..364c5ef19ec 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 846e4eeeccc..59a42787d04 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 05f03cd398f..7df7597598e 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 5720d45f891..98da716d6d0 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 cc2bf0ec89e..e83fca70817 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 3c758e5a8f7..0fe1f25f899 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 1441cd5b44e..570e1024066 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 857253020ee..77796470272 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 c88bba5e693..ac11a4f83cf 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 cb67141af9c..6edd7d7e4b9 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
--
GitLab