diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 14fd0ae00d0..7ece9f80da3 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -825,7 +825,7 @@ if (is_array($blocks)) {
print '
';
print '| ';
print $langs->trans("TotalForThePeriod");
- print ' - '.($source ? $langs->trans("POS").' '.ucfirst($source) : $langs->trans("BackOffice"));
+ print ' - '.($source ? $langs->trans("PointOfSale").' '.ucfirst($source) : $langs->trans("BackOffice"));
print ' ('.$langs->trans("ForPeriodAndFilters").')';
print ' | ';
print '
';
@@ -842,13 +842,12 @@ if (is_array($blocks)) {
// ID
print '';
- print dolPrintHTML($langs->trans("TotalForAction").' '.$langs->trans('log'.$actioncode));
if ($actioncode == 'BILL_VALIDATE') {
- print ' ('.$langs->trans("Turnover").')';
+ $s = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("Turnover");
} elseif ($actioncode == 'PAYMENT_CUSTOMER') {
- print ' ('.$langs->trans("TurnoverCollected").')';
+ $s = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("TurnoverCollected");
}
- //print ' '.$langs->trans("ForPeriodAndFilters").'';
+ print $form->textwithpicto($s, $langs->trans("TotalForAction").' '.$langs->trans('log'.$actioncode));
print ' | ';
// Action
@@ -944,8 +943,9 @@ if (is_array($blocks)) {
print '';
print '| ';
+
print $langs->trans("TotalForLifetime");
- print ' - '.($source ? $langs->trans("POS").' '.ucfirst($source) : $langs->trans("BackOffice"));
+ print ' - '.($source ? $langs->trans("PointOfSale").' '.ucfirst($source) : $langs->trans("BackOffice"));
print ' ('.dol_print_date($firstrecorddate, 'dayhour', 'tzuserrel');
if ($search_end && $search_end != -1) {
@@ -969,15 +969,11 @@ if (is_array($blocks)) {
// ID
print ' | ';
- print dolPrintHTML($langs->trans("TotalForAction").' '.$langs->trans('logBILL_VALIDATE'));
- print ' ('.$langs->trans("Turnover").')';
- print ' '.$langs->trans("LifetimeAmountShort").': '.dol_print_date($firstrecorddate, 'dayhour', 'tzuserrel');
- if ($search_end && $search_end != -1) {
- print ' - '.dol_print_date($search_end, 'dayhoursec', 'tzuserrel');
- } else {
- print ' - '.$langs->trans("Now");
- }
- print ' ';
+
+ $s = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("Turnover");
+ print $form->textwithpicto($s, $langs->trans("TotalForAction").' '.$langs->trans('logBILL_VALIDATE'));
+
+ print ' ';
// If there is at least one record with old format
$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog WHERE object_format < 'V2' and action = 'BILL_VALIDATE' LIMIT 1";
@@ -1042,15 +1038,10 @@ if (is_array($blocks)) {
// ID
print ' | ';
- print dolPrintHTML($langs->trans("TotalForAction").' '.$langs->trans('logPAYMENT_CUSTOMER'));
- print ' ('.$langs->trans("TurnoverCollected").')';
- print ' '.$langs->trans("LifetimeAmountShort").': '.dol_print_date($firstrecorddate, 'dayhour', 'tzuserrel');
- if ($search_end && $search_end != -1) {
- print ' - '.dol_print_date($search_end, 'dayhoursec', 'tzuserrel');
- } else {
- print ' - '.$langs->trans("Now");
- }
- print '';
+
+ $s = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("TurnoverCollected");
+ print $form->textwithpicto($s, $langs->trans("TotalForAction").' '.$langs->trans('logPAYMENT_CUSTOMER'));
+
print ' | ';
// Action
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index a2f0858aefb..32cba14e609 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1433,12 +1433,12 @@ class FunctionsLibTest extends CommonClassTest
// Test RULE 2 (FR-FR)
print __METHOD__." rule=RULE 2 FR-FR\n";
$vat = get_default_tva($companyfr, $companyfr, 0);
- $this->assertEquals(20, $vat, 'RULE 2');
+ $this->assertEquals(20, $vat, 'RULE 2 FR-FR - Check that the dictionary is set to have default VAT to 20');
// Test RULE 2 (FR-MC)
print __METHOD__." rule=RULE 2 FR-MC\n";
$vat = get_default_tva($companyfr, $companymc, 0);
- $this->assertEquals(20, $vat, 'RULE 2');
+ $this->assertEquals(20, $vat, 'RULE 2 FR-MC');
// Test RULE 3 (FR-DE company)
print __METHOD__." rule=RULE 3 FR-DE\n";