diff --git a/dev/translation/ignore_translation_keys.lst b/dev/translation/ignore_translation_keys.lst
index 3945b5a4f8b..c8e2dfc5294 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
@@ -200,7 +199,6 @@ CloneProgression
CloneTimes
Close Done
Close2
-CloseShipment
CodeTooltipHelp
Column
Combination
@@ -215,7 +213,6 @@ ConfirmActionMyObject
ConfirmActionTarget
ConfirmCloneMyObject
ConfirmCloneTask
-ConfirmCloseShipment
ConfirmCreateAdherent
ConfirmDeleteAdherent
ConfirmDeleteIndividual
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).'
';
}
}
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/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index f2fafacff93..bc12badb248 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -90,3 +90,5 @@ TypeContact_shipping_external_BILLING=Customer invoice contact
TypeContact_shipping_external_CUSTOMER=Customer contact following-up shipping
TypeContact_shipping_external_SHIPPING=Customer contact for shipping
TypeContact_shipping_external_DELIVERY=Customer contact for delivery
+CloseShipment=Close shipment
+ConfirmCloseShipment=Confirm close shipment
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 1bfd7b4361e..853176694ca 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -2012,14 +2012,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
print ''."\n";
- $jquerytheme = 'base';
- if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
- $jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
- }
- if (constant('JS_JQUERY_UI')) {
- print ''."\n"; // Forced JQuery
- } else {
- print ''."\n"; // JQuery
+ if (!defined('DISABLE_JQUERY_UI')) {
+ $jquerytheme = 'base';
+ if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
+ $jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
+ }
+ if (constant('JS_JQUERY_UI')) {
+ print '' . "\n"; // Forced JQuery
+ } else {
+ print '' . "\n"; // JQuery
+ }
}
if (!defined('DISABLE_JQUERY_JNOTIFY')) {
print ''."\n"; // JNotify
@@ -2036,7 +2038,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print ''."\n";
}
- print ''."\n";
// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
$themepath = dol_buildpath($conf->css, 1);
$themesubdir = '';
@@ -2050,8 +2051,11 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
}
}
- //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
- print ''."\n";
+ if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
+ print ''."\n";
+ print '' . "\n";
+ }
+
if (getDolGlobalString('MAIN_FIX_FLASH_ON_CHROME')) {
print ''."\n".''."\n";
}
@@ -2118,10 +2122,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} else {
print ''."\n";
}
- if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
- print ''."\n";
- } else {
- print ''."\n";
+ if (!defined('DISABLE_JQUERY_UI')) {
+ if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+ print '' . "\n";
+ } else {
+ print '' . "\n";
+ }
}
// jQuery jnotify
if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index e801451df37..8c84311b6c6 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
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index baec057484e..eab30a6de09 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
@@ -64,7 +64,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
*/
// Load translation files required by the page
-$langs->loadLangs(array("admin", "other", "website", "errors"));
+$langs->loadLangs(array("admin", "other", "website"));
// Security check
if (!$user->hasRight('website', 'read')) {
@@ -2078,12 +2078,10 @@ if ($action == 'updatemeta' && $usercanedit) {
$langs->load("errors");
if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
$error++;
- $langs->load("errors");
setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
$action = 'editmeta';
} else {
$error++;
- $langs->load("errors");
setEventMessages($objectpage->error, $objectpage->errors, 'errors');
$action = 'editmeta';
}
@@ -4809,7 +4807,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') { // Edit properties
print '| ';
print $langs->trans('PublicAuthorAlias');
print ' | ';
- print '';
+ print '';
print ' |
';
print '|