From 8cea5072e5e5db106ff3decfc14ebaa588341b97 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 15 Dec 2006 12:18:58 +0000
Subject: [PATCH] Gestion des prix TTC

---
 htdocs/product/canvas/livre/livre-create.tpl | 13 +++++++++----
 htdocs/product/canvas/livre/livre-edit.tpl   | 12 ++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/htdocs/product/canvas/livre/livre-create.tpl b/htdocs/product/canvas/livre/livre-create.tpl
index 2f2e1c7189f..f13da8f9de8 100644
--- a/htdocs/product/canvas/livre/livre-create.tpl
+++ b/htdocs/product/canvas/livre/livre-create.tpl
@@ -4,6 +4,7 @@
 <input type="hidden" name="action" value="add">
 <input type="hidden" name="type" value="0">
 <input type="hidden" name="canvas" value="livre">
+<input type="hidden" name="price_base_type" value="TTC">
 
 <table class="border" width="100%">
  <tr>
@@ -81,9 +82,7 @@
   <td>Taux TVA</td>
   <td>
    <select class="flat" name="tva_tx">
-    <option value="0">0%</option>
-    <option value="5.5">5.5%</option>
-    <option value="19.6" selected="true">19.6%</option>
+    {html_options values=$tva_taux_value output=$tva_taux_libelle selected="5.5"}
    </select>
   </td>
  </tr>
@@ -106,12 +105,18 @@
  </tr>
  <tr>
   <td>Statut</td>
-  <td colspan="3">
+  <td>
    <select class="flat" name="statut">
     <option value="1" selected="true">En vente</option>
     <option value="0">Hors vente</option>
    </select>
   </td>
+  <td>Poids</td>
+  <td>
+   <input name="weight" size="5" value=""
+     class="normal" onfocus="this.className='focus';" onblur="this.className='normal';">g
+   <input name="weight_units" type="hidden" value="-3">
+  </td>
  </tr>
 </table>
 
diff --git a/htdocs/product/canvas/livre/livre-edit.tpl b/htdocs/product/canvas/livre/livre-edit.tpl
index fd5088937b9..232ed7b084c 100644
--- a/htdocs/product/canvas/livre/livre-edit.tpl
+++ b/htdocs/product/canvas/livre/livre-edit.tpl
@@ -4,6 +4,7 @@
 <input type="hidden" name="action" value="update">
 <input type="hidden" name="id" value="{$prod_id}">
 <input type="hidden" name="canvas" value="{$prod_canvas}">
+<input type="hidden" name="price_base_type" value="TTC">
 
 <table class="border" width="100%">
  <tr>
@@ -92,7 +93,7 @@
 <table class="border" width="100%">
  <tr>
   <td width="15%">Prix de vente</td>
-  <td width="35%">{$prod_pxvente}</td>
+  <td width="35%">{$prod_pxvente} TTC</td>
   <td width="15%">Taux TVA</td>
   <td width="35%">
    <select class="flat" name="tva_tx">
@@ -185,14 +186,5 @@
 
 </table>
 </form>
-<!-- CUT HERE -->
-
-
-
-
-
-
-
-
 
 <!-- END SMARTY TEMPLATE -->
\ No newline at end of file