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 '
';
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");
|
-
- |
+
+
+ |
currency; ?> |
@@ -122,9 +123,9 @@ $langs->load("cashdesk");
| | currency; ?> |
+
|