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

Fix credit note card apparence

Browse Source
This commit is contained in:
John 2018-04-05 09:46:55 +02:00
parent ce24ca08ee
commit e966d11356
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/compta/facture/card.php
View File

@ -4586,6 +4586,7 @@ else if ($id > 0 || ! empty($ref))
// remove situation from cycle // remove situation from cycle
if ($object->statut == Facture::STATUS_VALIDATED if ($object->statut == Facture::STATUS_VALIDATED
&& $object->type == Facture::TYPE_SITUATION
&& $user->rights->facture->creer && $user->rights->facture->creer
&& !$objectidnext && !$objectidnext
&& $object->situation_counter > 1 && $object->situation_counter > 1

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

@ -1530,8 +1530,16 @@ class Facture extends CommonInvoice
$invoice = new Facture($this->db); $invoice = new Facture($this->db);
if ($invoice->fetch($objp->rowid) > 0) if ($invoice->fetch($objp->rowid) > 0)
{ {
if ($objp->situation_counter < $this->situation_counter) $this->tab_previous_situation_invoice[] = $invoice; if ($objp->situation_counter < $this->situation_counter
else $this->tab_next_situation_invoice[] = $invoice; || ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
)
{
$this->tab_previous_situation_invoice[] = $invoice;
}
else
{
$this->tab_next_situation_invoice[] = $invoice;
}
} }
} }
} }