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

Fix CI (code style)

Browse Source
This commit is contained in:
Jean Traullé 2019-08-27 08:43:58 +02:00
parent c08c3b5c9c
commit 0702ef4e0f
No known key found for this signature in database
GPG Key ID: 5315BC7C950D912A
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commoninvoice.class.php
View File

@ -201,7 +201,7 @@ abstract class CommonInvoice extends CommonObject
* @param int $multicurrency Return multicurrency_amount instead of amount * @param int $multicurrency Return multicurrency_amount instead of amount
* @return int <0 if KO, Sum of credit notes and deposits amount otherwise * @return int <0 if KO, Sum of credit notes and deposits amount otherwise
*/ */
function getSumFromThisCreditNotesNotUsed($multicurrency=0) public function getSumFromThisCreditNotesNotUsed($multicurrency = 0)
{ {
require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';

4
htdocs/core/class/discount.class.php
View File

@ -636,7 +636,7 @@ class DiscountAbsolute
* @param int $multicurrency Return multicurrency_amount instead of amount * @param int $multicurrency Return multicurrency_amount instead of amount
* @return int <0 if KO, Sum of credit notes and deposits amount otherwise * @return int <0 if KO, Sum of credit notes and deposits amount otherwise
*/ */
function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency=0) public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
{ {
dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG); dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
@ -646,7 +646,7 @@ class DiscountAbsolute
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
$sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id; $sql.= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
} }
else if ($invoice->element == 'invoice_supplier') elseif ($invoice->element == 'invoice_supplier')
{ {
$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount'; $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';