From e92220bd135076e9f1f39af71ea008b9cb37e65d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 29 Sep 2007 11:35:43 +0000
Subject: [PATCH] Affichage du code barre dans l'onglet

---
 htdocs/admin/barcode.php   |  2 +-
 htdocs/product/barcode.php | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 0d14b56f650..bfa124c02e5 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -37,7 +37,7 @@ if (!$user->admin)
 
 if ($_POST["action"] == 'setcoder' && $user->admin)
 {
-	$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode";
+	$sqlp = "UPDATE ".MAIN_DB_PREFIX."c_barcode_type";
   $sqlp.= " SET coder = " . $_POST["coder"];
   $sqlp.= " WHERE rowid = ". $_POST["code_id"];
   $resql=$db->query($sqlp);
diff --git a/htdocs/product/barcode.php b/htdocs/product/barcode.php
index 7c7c350ff89..d55fd7d1a4b 100644
--- a/htdocs/product/barcode.php
+++ b/htdocs/product/barcode.php
@@ -62,13 +62,17 @@ print '<table class="border" width="100%">';
 
 // Reference
 print '<tr>';
-print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="2">';
+print '<td width="15%">'.$langs->trans("Ref").'</td><td colspan="3">';
 print $html->showrefnav($product,'ref');
 print '</td>';
 print '</tr>';
 
 // Libelle
 print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$product->libelle.'</td>';
+
+// Barcode image
+print '<td width="300" align="center" rowspan="5"><img src="'.dol_genbarcode($product->barcode,$product->barcode_type_code,$product->barcode_type_coder).'"></td>';
+
 print '</tr>';
 
  // Prix
@@ -93,6 +97,11 @@ print '<tr><td>'.$langs->trans("BarcodeType").'</td><td colspan="2">';
 print $product->barcode_type_label;
 print '</td></tr>';
 
+// Barcode	 
+print '<tr><td>'.$langs->trans("Barcode").'</td><td colspan="2">';
+print $product->barcode;
+print '</td></tr>';
+
 print "</table>\n";
       
 print "</div>\n";