From f35c03aaca4df4070fbbbc47c2146286f9a8e17e Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Mon, 4 Dec 2006 17:50:20 +0000
Subject: [PATCH] Homogeinisation des formulaires

---
 htdocs/product/canvas/livre/fiche-edit.tpl | 70 +++++++++++++---------
 htdocs/product/canvas/livre/fiche-view.tpl |  4 +-
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/htdocs/product/canvas/livre/fiche-edit.tpl b/htdocs/product/canvas/livre/fiche-edit.tpl
index 785f19cc290..f3c60e35d6b 100644
--- a/htdocs/product/canvas/livre/fiche-edit.tpl
+++ b/htdocs/product/canvas/livre/fiche-edit.tpl
@@ -75,14 +75,18 @@
 </tr>
 <tr>
  <td>Prix de revient</td>
- <td>{$prod_pxrevient}</td>
- <td>Prix de vente</td>
- <td>{$prod_pxvente}</td>
+ <td colspan="3">{$prod_pxrevient}</td>
 </tr>
+</table>
 
+<br />
+
+<table class="border" width="100%">
  <tr>
-  <td>Taux TVA</td>
-  <td colspan="2">
+  <td width="15%">Prix de vente</td>
+  <td width="35%">{$prod_pxvente}</td>
+  <td width="15%">Taux TVA</td>
+  <td width="35%">
    <select class="flat" name="tva_tx">
     <option value="0">0%</option>
     <option value="5.5">5.5%</option>
@@ -90,38 +94,50 @@
    </select>
   </td>
  </tr>
+</table>
+
+<br />
+
+<table class="border" width="100%">
  <tr>
-  <td>État</td>
-  <td colspan="2">
+ <td width="15%">Stock</td>
+ <td width="35%"><b>{$prod_stock_dispo}</b></td>
+  <td width="15%">Seuil d'alerte stock</td>
+  <td width="35%">
+   <input name="seuil_stock_alerte" size="4" value="{$prod_seuil_stock_alerte}"
+     class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
+  </td>
+</tr>
+
+<tr>
+  <td width="15%">Emplacement Stock</td>
+  <td width="85%" colspan="3">
+   <input name="stock_loc" size="8" value=""
+     class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
+  </td>
+ </tr>
+ <tr>
+  <td>Statut</td>
+  <td colspan="3">
    <select class="flat" name="statut">
     <option value="1" selected="true">En vente</option>
     <option value="0">Hors vente</option>
    </select>
   </td>
  </tr>
- <tr>
-  <td>Seuil stock</td>
-  <td colspan="2"><input name="seuil_stock_alerte" size="4"
-  value="300"></td>
- </tr>
+</table>
 
-<tr>
- <td>Emplacement Stock</td>
- <td colspan="3">{$prod_pages}</td>
-</tr>
+<br />
 
+<table class="border" width="100%">
 <tr>
- <td colspan="4">Contrat</td>
-</tr>
-
-<tr>
- <td>Durée du contrat :</td>
- <td>
+ <td width="15%">Durée du contrat :</td>
+ <td width="35%">
   <input name="contrat_duree" type="text" size="7" maxlength="6" value="{$prod_contrat_duree}"
    class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
  </td>
- <td>Date d'application</td>
- <td>
+ <td width="15%">Date d'application</td>
+ <td width="35%">
   <input name="contrat_date_app" type="text" size="7" maxlength="6" value="{$prod_contrat_date_app}"
    class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">
  </td>
@@ -143,7 +159,7 @@
  <tr>
   <td valign="top">Description</td>
   <td colspan="3">
-    <textarea name="desc" rows="4" cols="90"></textarea>
+    <textarea name="desc" rows="6" cols="70"></textarea>
   </td>
  </tr>
 
@@ -151,11 +167,11 @@
   <td valign="top">Note (non visible sur les factures, propals...)
   </td>
   <td colspan="3">
-   <textarea name="note" rows="8" cols="70"></textarea>
+   <textarea name="note" rows="4" cols="70"></textarea>
   </td>
  </tr>
  <tr>
-  <td colspan="3" align="center">
+  <td colspan="4" align="center">
    <input type="submit" class="button" value="Enregistrer">&nbsp;
    <input type="submit" class="button" name="cancel" value="Annuler">
   </td>
diff --git a/htdocs/product/canvas/livre/fiche-view.tpl b/htdocs/product/canvas/livre/fiche-view.tpl
index 91a884a6722..be73633d0e6 100644
--- a/htdocs/product/canvas/livre/fiche-view.tpl
+++ b/htdocs/product/canvas/livre/fiche-view.tpl
@@ -44,7 +44,9 @@
 
 <tr>
  <td width="15%">Stock</td>
- <td width="85%" colspan="3"><b>{$prod_stock_dispo}</b></td>
+ <td width="35%"><b>{$prod_stock_dispo}</b></td>
+ <td width="15%">Seuil d'alerte</td>
+ <td width="35%">{$prod_stock_alert}</td>
 </tr>
 
 <tr>