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

This commit is contained in:
Laurent Destailleur 2017-05-11 14:39:47 +02:00
commit bccfa3dbed
2 changed files with 3 additions and 3 deletions

View File

@ -95,7 +95,7 @@ abstract class CommonInvoice extends CommonObject
* This does not include open direct debit requests. * This does not include open direct debit requests.
* *
* @param int $multicurrency Return multicurrency_amount instead of amount * @param int $multicurrency Return multicurrency_amount instead of amount
* @return int Remain of amount to pay * @return double Remain of amount to pay
*/ */
function getRemainToPay($multicurrency=0) function getRemainToPay($multicurrency=0)
{ {

View File

@ -520,8 +520,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
* Show table for lines * Show table for lines
* *
* @param PDF $pdf Object PDF * @param PDF $pdf Object PDF
* @param string $tab_top Top position of table * @param integer $tab_top Top position of table
* @param string $tab_height Height of table (rectangle) * @param integer $tab_height Height of table (rectangle)
* @param int $nexY Y (not used) * @param int $nexY Y (not used)
* @param Translate $outputlangs Langs object * @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array * @param int $hidetop Hide top bar of array