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

Merge remote branch 'upstream/develop' into php-iban

Browse Source
This commit is contained in:
frederic34 2015-02-17 11:43:23 +01:00
commit 376eadd22c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
View File

@ -444,7 +444,7 @@ class pdf_ extends ModeleExpenseReport
/** /**
* Show top header of page. * Show top header of page.
* *
* @param PDF &$pdf Object PDF * @param PDF $pdf Object PDF
* @param Object $object Object to show * @param Object $object Object to show
* @param int $showaddress 0=no, 1=yes * @param int $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output * @param Translate $outputlangs Object lang for output
@ -660,11 +660,11 @@ class pdf_ extends ModeleExpenseReport
/** /**
* Affiche la grille des lignes de factures * Affiche la grille des lignes de factures
* *
* @param $pdf Objet PDF * @param PDF $pdf Object PDF
* @param $tab_top Tab top * @param int $tab_top Tab top
* @param $tab_height Tab height * @param int $tab_height Tab height
* @param $nexY next y * @param int $nexY next y
* @param $outputlangs Output langs * @param Translate $outputlangs Output langs
* @return void * @return void
*/ */
function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs) function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs)

2
htdocs/expensereport/class/expensereport.class.php
View File

@ -561,7 +561,7 @@ class ExpenseReport extends CommonObject
/** /**
* recalculer * recalculer
* *
* @param int $id * @param int $id Id of expense report
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function recalculer($id) function recalculer($id)