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

Merge pull request #9881 from grandoc/8.0

Browse Source 
merging and typo
This commit is contained in:
Laurent Destailleur 2018-10-30 12:41:56 +01:00 committed by GitHub
commit 0127682996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/facture/class/facture.class.php
View File

@ -206,7 +206,7 @@ class Facture extends CommonInvoice
* If paid partially, $this->close_code can be: * If paid partially, $this->close_code can be:
* - CLOSECODE_DISCOUNTVAT * - CLOSECODE_DISCOUNTVAT
* - CLOSECODE_BADDEBT * - CLOSECODE_BADDEBT
* If paid completelly, this->close_code will be null * If paid completely, this->close_code will be null
*/ */
const STATUS_CLOSED = 2; const STATUS_CLOSED = 2;
@ -2370,7 +2370,7 @@ class Facture extends CommonInvoice
} }
} }
// Set new ref and define current statut // Set new ref and define current status
if (! $error) if (! $error)
{ {
$this->ref = $num; $this->ref = $num;
@ -4836,7 +4836,7 @@ class FactureLigne extends CommonInvoiceLine
if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") { if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
return 0; return 0;
} else { } else {
// If invoice is a not a situation invoice, this->fk_prev_id is used for something else // If invoice is not a situation invoice, this->fk_prev_id is used for something else
$tmpinvoice=new Facture($this->db); $tmpinvoice=new Facture($this->db);
$tmpinvoice->fetch($invoiceid); $tmpinvoice->fetch($invoiceid);
if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0; if ($tmpinvoice->type != Facture::TYPE_SITUATION) return 0;