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

Try a fix for #11852

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-15 16:00:01 +02:00
parent 421631f2be
commit 23860b15ee
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/societe/class/societe.class.php
View File

@ -3914,17 +3914,17 @@ class Societe extends CommonObject
while($obj=$this->db->fetch_object($resql)) { while($obj=$this->db->fetch_object($resql)) {
$tmpobject->id=$obj->rowid; $tmpobject->id=$obj->rowid;
if ($obj->fk_statut != Facture::STATUS_DRAFT // Not a draft if ($obj->fk_statut != $tmpobject::STATUS_DRAFT // Not a draft
&& ! ($obj->fk_statut == Facture::STATUS_ABANDONED && $obj->close_code == 'replaced') // Not a replaced invoice && ! ($obj->fk_statut == $tmpobject::STATUS_ABANDONED && $obj->close_code == 'replaced') // Not a replaced invoice
) )
{ {
$outstandingTotal+= $obj->total_ht; $outstandingTotal+= $obj->total_ht;
$outstandingTotalIncTax+= $obj->total_ttc; $outstandingTotalIncTax+= $obj->total_ttc;
} }
if ($obj->paye == 0 if ($obj->paye == 0
&& $obj->fk_statut != Facture::STATUS_DRAFT // Not a draft && $obj->fk_statut != $tmpobject::STATUS_DRAFT // Not a draft
&& $obj->fk_statut != Facture::STATUS_ABANDONED // Not abandonned && $obj->fk_statut != $tmpobject::STATUS_ABANDONED // Not abandonned
&& $obj->fk_statut != Facture::STATUS_CLOSED) // Not classified as paid && $obj->fk_statut != $tmpobject::STATUS_CLOSED) // Not classified as paid
//$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason //$sql .= " AND (fk_statut <> 3 OR close_code <> 'abandon')"; // Not abandonned for undefined reason
{ {
$paiement = $tmpobject->getSommePaiement(); $paiement = $tmpobject->getSommePaiement();
@ -3935,7 +3935,11 @@ class Societe extends CommonObject
} }
//if credit note is converted but not used //if credit note is converted but not used
if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed(); // TODO Do this also for customer ?
if($mode == 'supplier' && $obj->type == FactureFournisseur::TYPE_CREDIT_NOTE && $tmpobject->isCreditNoteUsed())
{
$outstandingOpened-=$tmpobject->getSumFromThisCreditNotesNotUsed();
}
} }
return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes' return array('opened'=>$outstandingOpened, 'total_ht'=>$outstandingTotal, 'total_ttc'=>$outstandingTotalIncTax); // 'opened' is 'incl taxes'
} }