Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur (aka Eldy) 2025-02-07 10:46:56 +01:00
commit 0dbf65c40d
7 changed files with 33 additions and 26 deletions

View file

@ -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

View file

@ -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 '<br><br><div class="small inline-block">'.$langs->trans("VATRate").'</div>';
print '<br><br><div class="small inline-block width100">'.$langs->trans("TotalHT").'</div><div class="small inline-block width100">'.$langs->trans("TotalVAT").'</div>';
foreach ($totalvatperrate as $keyrate => $valuerate) {
print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' : <div class="inline-block amount width100"></div><div class="inline-block amount width100">'.price($valuerate).'</div></div>';
print '<br><div class="small">'.$langs->trans("VATRate").' '.vatrate($keyrate, true).' : <div class="inline-block amount width100">'.price($totalhtperrate[$keyrate] ?? 0).'</div><div class="inline-block amount width100">'.price($valuerate).'</div></div>';
}
}

View file

@ -1349,3 +1349,4 @@ EcoTax=Eco-Tax
GroupingLine=Grouping line
AllTime=From start
Transferred=Transferred
Anonymous=Anonymous

View file

@ -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

View file

@ -2012,14 +2012,16 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
$jquerytheme = 'base';
if (getDolGlobalString('MAIN_USE_JQUERY_THEME')) {
$jquerytheme = getDolGlobalString('MAIN_USE_JQUERY_THEME');
}
if (constant('JS_JQUERY_UI')) {
print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
} else {
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\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 '<link rel="stylesheet" type="text/css" href="' . JS_JQUERY_UI . 'css/' . $jquerytheme . '/jquery-ui.min.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // Forced JQuery
} else {
print '<link rel="stylesheet" type="text/css" href="' . DOL_URL_ROOT . '/includes/jquery/css/' . $jquerytheme . '/jquery-ui.css' . ($ext ? '?' . $ext : '') . '">' . "\n"; // JQuery
}
}
if (!defined('DISABLE_JQUERY_JNOTIFY')) {
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
@ -2036,7 +2038,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$fontawesome_directory.'/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
}
print '<!-- Includes CSS for Dolibarr theme -->'."\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 '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
if (!defined('DISABLE_CSS_DEFAULT_THEME')) {
print '<!-- Includes CSS for Dolibarr theme -->'."\n";
print '<link rel="stylesheet" type="text/css" href="' . $themepath . $themeparam . '">' . "\n";
}
if (getDolGlobalString('MAIN_FIX_FLASH_ON_CHROME')) {
print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
}
@ -2118,10 +2122,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
} else {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
}
if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
print '<script nonce="'.getNonce().'" src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
} else {
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
if (!defined('DISABLE_JQUERY_UI')) {
if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
print '<script nonce="' . getNonce() . '" src="' . JS_JQUERY_UI . 'jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
} else {
print '<script nonce="' . getNonce() . '" src="' . DOL_URL_ROOT . '/includes/jquery/js/jquery-ui.min.js' . ($ext ? '?' . $ext : '') . '"></script>' . "\n";
}
}
// jQuery jnotify
if (!getDolGlobalString('MAIN_DISABLE_JQUERY_JNOTIFY') && !defined('DISABLE_JQUERY_JNOTIFY')) {

View file

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
*
* 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

View file

@ -2,7 +2,7 @@
/* Copyright (C) 2016-2023 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
*
* 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 '<tr class="trpublicauthor hidden"><td>';
print $langs->trans('PublicAuthorAlias');
print '</td><td>';
print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="Anonymous">';
print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="'.dol_escape_htmltag($langs->trans("Anonymous")).'">';
print '</td></tr>';
print '<tr><td class="tdhtmlheader tdtop">';