From dd20d040022211c2e19ee5a86c16053590dd7711 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Oct 2014 12:59:19 +0100
Subject: [PATCH] Fix: Must use active tag of vat, not county table.

---
 htdocs/cashdesk/affContenu.php           |  3 +++
 htdocs/cashdesk/facturation.php          |  4 ++--
 htdocs/cashdesk/tpl/facturation1.tpl.php | 11 +++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/htdocs/cashdesk/affContenu.php b/htdocs/cashdesk/affContenu.php
index 543006baedf..08326e687e8 100644
--- a/htdocs/cashdesk/affContenu.php
+++ b/htdocs/cashdesk/affContenu.php
@@ -43,6 +43,9 @@ else
 	$obj_facturation = new Facturation();
 }
 
+
+
+// Right area with selected articles (shopping cart)
 print '<div class="liste_articles">';
 
 require ('tpl/liste_articles.tpl.php');
diff --git a/htdocs/cashdesk/facturation.php b/htdocs/cashdesk/facturation.php
index a168fba5b7b..dd722805eb6 100644
--- a/htdocs/cashdesk/facturation.php
+++ b/htdocs/cashdesk/facturation.php
@@ -158,9 +158,9 @@ $sql = "SELECT t.rowid, t.taux";
 $sql.= " FROM ".MAIN_DB_PREFIX."c_tva as t";
 $sql.= ", ".MAIN_DB_PREFIX."c_country as c";
 $sql.= " WHERE t.fk_pays = c.rowid";
-$sql.= " AND c.active = 1";
+$sql.= " AND t.active = 1";
 $sql.= " AND c.code = '".$mysoc->country_code."'";
-//print $request;
+//print $sql;
 
 $resql = $db->query($sql);
 if ($resql)
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 1a009fcead0..f2258c6473e 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -111,8 +111,9 @@ $langs->load("cashdesk");
 				<td>
 				<input class="texte1_off" type="text" name="txtStock" value="<?php echo $obj_facturation->stock() ?>" disabled="disabled" />
 				</td>
-				<!-- Affichage du prix unitaire -->
-				<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td>
+				<!-- Show unit price -->
+				<?php // TODO Remove the disabled and use this value when adding product into cart ?>
+				<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled="disabled" /></td>
 				<td><?php echo $conf->currency; ?></td>
     			<!-- Choix de la remise -->
     			<td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
@@ -122,9 +123,9 @@ $langs->load("cashdesk");
     			<td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td>
                 <!-- Choix du taux de TVA -->
                 <td class="select_tva">
+                <?php //var_dump($tab_tva); ?>
                 <select name="selTva" onchange="javascript: modif();" >
                     <?php
-
                         $tva_tx = $obj_facturation->tva();
                         $tab_tva_size=count($tab_tva);
                         for($i=0;$i < $tab_tva_size;$i++) {
@@ -132,12 +133,10 @@ $langs->load("cashdesk");
                             if ( $tva_tx == $tab_tva[$i]['taux'] )
                                 $selected = 'selected="selected"';
                             else
-                                $selected = '';
+                            $selected = '';
 
                             echo ('<option '.$selected.' value="'.$tab_tva[$i]['rowid'].'">'.$tab_tva[$i]['taux'].'</option>'."\n               ");
-
                         }
-
                     ?>
                 </select>
                 </td>