vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-19 21:29:07 +01:00
commit 4da39a8f5d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dev/tools/phan/config_extended.php
View file

@ -313,7 +313,7 @@ return [
'ConstantVariablePlugin', // Warns about values that are actually constant
//'HasPHPDocPlugin', // Requires PHPDoc
'InlineHTMLPlugin', // html in PHP file, or at end of file
// 'InlineHTMLPlugin', // html in PHP file, or at end of file
'NonBoolBranchPlugin', // Requires test on bool, nont on ints
'NonBoolInLogicalArithPlugin',
'NumericalComparisonPlugin',

6
htdocs/societe/notify/card.php
View file

@ -3,6 +3,7 @@
* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* 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
@ -240,7 +241,7 @@ if ($result > 0) {
$resql = $db->query($sql);
if ($resql) {
$num = $db->num_rows($resql);
$totalnboflines = $db->num_rows($resql);
} else {
dol_print_error($db);
}
@ -252,7 +253,8 @@ if ($result > 0) {
// Add notification form
//print load_fiche_titre($titlelist.' <span class="opacitymedium colorblack paddingleft">('.$num.')</span>', '', '');
print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $num, 'email', 0, $newcardbutton, '', $limit, 0, 0, 1);
$num = $totalnboflines;
print_barre_liste($titlelist, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'email', 0, $newcardbutton, '', $limit, 0, 0, 1);
print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
print '<input type="hidden" name="token" value="'.newToken().'">';