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/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 884639b234e..bd6d76a3fc1 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -935,6 +935,7 @@ abstract class CommonDocGenerator
foreach ($date_specs as $date_spec) {
$propertyname = $date_spec[1];
if (property_exists($line, $propertyname)) {
+ // @phan-suppress-next-line PhanUndeclaredProperty
$resarray[$date_spec[0]] = dol_print_date($line->$propertyname, $date_spec[2], $date_spec[3], $date_spec[4]);
}
}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index f8a99d51d40..006d797f5b6 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -405,6 +405,7 @@ class doc_generic_bom_odt extends ModelePDFBom
if ($foundtagforlines) {
$linenumber = 0;
foreach ($object->lines as $line) {
+ /** @var BOMLine $line */
$linenumber++;
if ($line->fk_product > 0) {
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')) {