lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-12-17 03:10:02 +01:00
commit c37deeeb78
14 changed files with 660 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/boxes/box_activity.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2012 Charles-François BENKE <charles.fr@benke.fr> /* Copyright (C) 2012 Charles-François BENKE <charles.fr@benke.fr>
* Copyright (C) 2005-2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2014-2015 Frederic France <frederic.france@free.fr> * Copyright (C) 2014-2019 Frederic France <frederic.france@netlogic.fr>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -431,7 +431,7 @@ class box_activity extends ModeleBoxes
$line++; $line++;
$j++; $j++;
} }
if ($num==0) { if (count($data)==0) {
$this->info_box_contents[$line][0] = array( $this->info_box_contents[$line][0] = array(
'td' => 'class="center"', 'td' => 'class="center"',
'text'=>$langs->trans("NoRecordedInvoices"), 'text'=>$langs->trans("NoRecordedInvoices"),

4
htdocs/datapolicy/class/actions_datapolicy.class.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseom.com> /* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseom.com>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr> * Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
* *
* This program is free software: you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -384,7 +384,7 @@ class ActionsDatapolicy
* @param Object $object Object * @param Object $object Object
* @param string $action Actions * @param string $action Actions
* @param HookManager $hookmanager Hook manager * @param HookManager $hookmanager Hook manager
* @return void * @return int
*/ */
public function printCommonFooter($parameters, &$object, &$action, $hookmanager) public function printCommonFooter($parameters, &$object, &$action, $hookmanager)
{ {

1
htdocs/ticket/class/api_tickets.class.php
View File

@ -291,6 +291,7 @@ class Tickets extends DolibarrApi
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
$num = $db->num_rows($result); $num = $db->num_rows($result);
$i = 0;
while ($i < $num) { while ($i < $num) {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$ticket_static = new Ticket($db); $ticket_static = new Ticket($db);