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

Fix phpcs

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-29 08:28:36 +02:00
parent 1c86eb1c44
commit 39f25c9fc2
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/tax.lib.php
View File

@ -236,11 +236,7 @@ function tax_by_date($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
$total_localtax1='total_localtax1'; $total_localtax1='total_localtax1';
$total_localtax2='total_localtax2'; $total_localtax2='total_localtax2';
<<<<<<< HEAD
// CAS DES BIENS/PRODUITS // CAS DES BIENS/PRODUITS
=======
// CAS DES BIENS
>>>>>>> branch '7.0' of git@github.com:Dolibarr/dolibarr.git
// Define sql request // Define sql request
$sql=''; $sql='';

24
htdocs/dav/dav.class.php
View File

@ -23,10 +23,8 @@
/** /**
* Define Common function to access calendar items * Define Common function to access calendar items and format it in vCalendar
* And format it in vCalendar */
* */
class CdavLib class CdavLib
{ {
@ -46,8 +44,9 @@ class CdavLib
/** /**
* Base sql request for calendar events * Base sql request for calendar events
* *
* @param int calendar user id * @param int $calid Calendard id
* @param int actioncomm object id * @param int|boolean $oid Oid
* @param int|boolean $ouri Ouri
* @return string * @return string
*/ */
public function getSqlCalEvents($calid, $oid=false, $ouri=false) public function getSqlCalEvents($calid, $oid=false, $ouri=false)
@ -113,7 +112,8 @@ class CdavLib
/** /**
* Convert calendar row to VCalendar string * Convert calendar row to VCalendar string
* *
* @param row object * @param int $calid Calendar id
* @param Object $obj Object id
* @return string * @return string
*/ */
public function toVCalendar($calid, $obj) public function toVCalendar($calid, $obj)
@ -239,11 +239,17 @@ class CdavLib
return $caldata; return $caldata;
} }
/**
* getFullCalendarObjects
*
* @param int $calendarId Calendar id
* @param int $bCalendarData Add calendar data
* @return array|string[][]|unknown[][]|NULL[][]
*/
public function getFullCalendarObjects($calendarId, $bCalendarData) public function getFullCalendarObjects($calendarId, $bCalendarData)
{ {
$calid = ($calendarId*1); $calid = ($calendarId*1);
$calevents = [] ; $calevents = array();
if(! $this->user->rights->agenda->myactions->read) if(! $this->user->rights->agenda->myactions->read)
return $calevents; return $calevents;