From 0a958e98ec7646f7071d5997dad5dbfb422683b2 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 4 Feb 2025 16:16:02 +0100
Subject: [PATCH 01/11] NEW: takepos cash control: add vat taxless total
---
htdocs/compta/cashcontrol/report.php | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index d4d1d6d758f..4b9d33c32af 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -226,6 +226,7 @@ if ($resql) {
$totalqty = 0;
$totalvat = 0;
$totalvatperrate = array();
+ $totalhtperrate = array();
$totallocaltax1 = 0;
$totallocaltax2 = 0;
$cachebankaccount = array();
@@ -257,8 +258,10 @@ if ($resql) {
if ($line->tva_tx) {
if (empty($totalvatperrate[$line->tva_tx])) {
$totalvatperrate[$line->tva_tx] = 0;
+ $totalhtperrate[$line->tva_tx] = 0;
}
$totalvatperrate[$line->tva_tx] += $line->total_tva;
+ $totalhtperrate[$line->tva_tx] += $line->total_ht;
}
$totallocaltax1 += $line->total_localtax1;
$totallocaltax2 += $line->total_localtax2;
@@ -448,9 +451,9 @@ if ($resql) {
}
if (!empty($totalvatperrate) && is_array($totalvatperrate)) {
- print '
'.$langs->trans("VATRate").'
';
+ print '
'.$langs->trans("TotalHT").'
'.$langs->trans("TotalVAT").'
';
foreach ($totalvatperrate as $keyrate => $valuerate) {
- print '
'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' :
'.price($valuerate).'
';
+ print '
'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' :
'.price($totalhtperrate[$keyrate] ?? 0).'
'.price($valuerate).'
';
}
}
From a9ef15ee55349c7dea85feec2febe368c64151a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
Date: Thu, 6 Feb 2025 13:26:58 +0100
Subject: [PATCH 02/11] fix missing translations
---
dev/translation/ignore_translation_keys.lst | 1 -
htdocs/langs/en_US/main.lang | 1 +
htdocs/public/donations/donateurs_code.php | 4 ++--
htdocs/website/index.php | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 3945b5a4f8b..68932ab360e 100644
--- a/dev/translation/ignore_translation_keys.lst
+++ b/dev/translation/ignore_translation_keys.lst
@@ -125,7 +125,6 @@ AmountOfinterventionsByMonthHT
AnObjectWithThisClassNameAlreadyExists
AnnualByAccountDueDebtMode
AnnualByAccountInputOutputMode
-Anonymous
AnotherField
Applications
Articles
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index b87d3e0c148..cf6093a6061 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1349,3 +1349,4 @@ EcoTax=Eco-Tax
GroupingLine=Grouping line
AllTime=From start
Transferred=Transferred
+Anonymous=Anonymous
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index e801451df37..b2d2d2c0e2b 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2018-2024 Frédéric France
+ * Copyright (C) 2018-2025 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -67,7 +67,7 @@ if (!isModEnabled('don')) {
}
-$langs->load("donations");
+$langs->load("donations", "main");
/*
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index baec057484e..fb33d4c0468 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2016-2023 Laurent Destailleur
* Copyright (C) 2020 Nicolas ZABOURI
* Copyright (C) 2024 MDW
- * Copyright (C) 2024 Frédéric France
+ * Copyright (C) 2024-2025 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -4809,7 +4809,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') { // Edit properties
print '| ';
print $langs->trans('PublicAuthorAlias');
print ' | ';
- print '';
+ print '';
print ' |
';
print '|