diff --git a/classes/module/ModuleGraph.php b/classes/module/ModuleGraph.php
index f087a0a2c..f74e66146 100644
--- a/classes/module/ModuleGraph.php
+++ b/classes/module/ModuleGraph.php
@@ -210,7 +210,7 @@ abstract class ModuleGraphCore extends Module
if (isset($this->_values[$key])) {
// We don't want strings to be divided. Example: product name
if (is_numeric($this->_values[$key])) {
- $this->_csv .= $this->_values[$key] / (($datas['type'] == 'pie') ? $total : 1);
+ $this->_csv .= $this->_values[$key] * 100 / (($datas['type'] == 'pie') ? $total : 1) . '%';
} else {
$this->_csv .= $this->_values[$key];
}
@@ -220,7 +220,7 @@ abstract class ModuleGraphCore extends Module
} else {
// We don't want strings to be divided. Example: product name
if (is_numeric($this->_values[$i][$key])) {
- $this->_csv .= $this->_values[$i][$key] / (($datas['type'] == 'pie') ? $total : 1);
+ $this->_csv .= $this->_values[$i][$key] * 100 / (($datas['type'] == 'pie') ? $total : 1) . '%';
} else {
$this->_csv .= $this->_values[$i][$key];
}
diff --git a/classes/module/ModuleGrid.php b/classes/module/ModuleGrid.php
index 024066626..13f6f18ee 100644
--- a/classes/module/ModuleGrid.php
+++ b/classes/module/ModuleGrid.php
@@ -153,7 +153,10 @@ abstract class ModuleGridCore extends Module
protected function csvExport($datas)
{
$this->_sort = $datas['defaultSortColumn'];
- $this->setLang(Context::getContext()->language->id);
+ $context = Context::getContext();
+ $this->setLang($context->language->id);
+ $this->setEmployee($context->employee->id);
+
if (isset($datas['option'])) {
$this->setOption($datas['option'], $layers);
}
diff --git a/modules/statsbestproducts/statsbestproducts.php b/modules/statsbestproducts/statsbestproducts.php
index 29459c0d7..deb4dd68f 100644
--- a/modules/statsbestproducts/statsbestproducts.php
+++ b/modules/statsbestproducts/statsbestproducts.php
@@ -229,18 +229,17 @@ class StatsBestProducts extends ModuleGrid
if (Tools::getValue('export') == false) {
$value['roomTypeName'] = ''.$value['roomTypeName'].'';
$value['hotelName'] = ''.$value['hotelName'].'';
+ if ($value['active']) {
+ $value['active'] = ''.$this->l('Yes').'';
+ } else {
+ $value['active'] = ''.$this->l('No').'';
+ }
}
$value['totalRoomsBooked'] = (int) $value['totalRoomsBooked'];
$value['availableRooms'] = max($value['totalRooms'] - $value['totalRoomsBooked'], 0); // availableRooms can be negative if more rooms are disabled than available for booking
$value['bookingsPerDay'] = sprintf('%0.2f', ($numberOfDays ? $value['totalRoomsBooked'] / $numberOfDays : 0));
$value['sellingPrice'] = Tools::displayPrice($value['sellingPrice'], $currency);
$value['totalRevenue'] = Tools::displayPrice($value['totalRevenue'], $currency);
-
- if ($value['active']) {
- $value['active'] = ''.$this->l('Yes').'';
- } else {
- $value['active'] = ''.$this->l('No').'';
- }
}
$this->_values = $values;
diff --git a/modules/statsproduct/statsproduct.php b/modules/statsproduct/statsproduct.php
index c6dd7f867..ec99f900a 100644
--- a/modules/statsproduct/statsproduct.php
+++ b/modules/statsproduct/statsproduct.php
@@ -332,7 +332,7 @@ class StatsProduct extends ModuleGraph
$this->html .= '
-
+
'.$this->l('CSV Export').'
';
}