Merge pull request #7924 from hregis/6.0_bug2
Fix: Avoid warning "A non-numeric value encountered"
This commit is contained in:
commit
5f71165020
@ -46,14 +46,14 @@ $confirm=GETPOST('confirm', 'alpha');
|
|||||||
// Security check
|
// Security check
|
||||||
$fieldname = (! empty($ref)?'ref':'rowid');
|
$fieldname = (! empty($ref)?'ref':'rowid');
|
||||||
if ($user->societe_id) $socid=$user->societe_id;
|
if ($user->societe_id) $socid=$user->societe_id;
|
||||||
$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque','','',$fieldname);
|
$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque','','fk_user_author',$fieldname);
|
||||||
|
|
||||||
$sortfield=GETPOST('sortfield', 'alpha');
|
$sortfield=GETPOST('sortfield', 'alpha');
|
||||||
$sortorder=GETPOST('sortorder', 'alpha');
|
$sortorder=GETPOST('sortorder', 'alpha');
|
||||||
$page=GETPOST('page', 'int');
|
$page=GETPOST('page', 'int');
|
||||||
if (! $sortorder) $sortorder="ASC";
|
if (! $sortorder) $sortorder="ASC";
|
||||||
if (! $sortfield) $sortfield="b.dateo,b.rowid";
|
if (! $sortfield) $sortfield="b.dateo,b.rowid";
|
||||||
if ($page < 0) { $page = 0 ; }
|
if (empty($page) || $page == -1) { $page = 0; }
|
||||||
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
|
$limit = GETPOST('limit')?GETPOST('limit','int'):$conf->liste_limit;
|
||||||
$offset = $limit * $page ;
|
$offset = $limit * $page ;
|
||||||
|
|
||||||
@ -492,10 +492,12 @@ if ($action == 'new')
|
|||||||
{
|
{
|
||||||
foreach ($lines[$bid] as $lid => $value)
|
foreach ($lines[$bid] as $lid => $value)
|
||||||
{
|
{
|
||||||
$account_id = $bid;
|
//$account_id = $bid; FIXME not used
|
||||||
if (! isset($accounts[$bid]))
|
|
||||||
|
// FIXME $accounts[$bid] is a label !
|
||||||
|
/*if (! isset($accounts[$bid]))
|
||||||
$accounts[$bid]=0;
|
$accounts[$bid]=0;
|
||||||
$accounts[$bid] += 1;
|
$accounts[$bid] += 1;*/
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.dol_print_date($value["date"],'day').'</td>';
|
print '<td>'.dol_print_date($value["date"],'day').'</td>';
|
||||||
@ -688,10 +690,12 @@ else
|
|||||||
{
|
{
|
||||||
while ($objp = $db->fetch_object($resql))
|
while ($objp = $db->fetch_object($resql))
|
||||||
{
|
{
|
||||||
$account_id = $objp->bid;
|
//$account_id = $objp->bid; FIXME not used
|
||||||
if (! isset($accounts[$objp->bid]))
|
|
||||||
|
// FIXME $accounts[$objp->bid] is a label
|
||||||
|
/*if (! isset($accounts[$objp->bid]))
|
||||||
$accounts[$objp->bid]=0;
|
$accounts[$objp->bid]=0;
|
||||||
$accounts[$objp->bid] += 1;
|
$accounts[$objp->bid] += 1;*/
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td align="center">'.$i.'</td>';
|
print '<td align="center">'.$i.'</td>';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user